Merge remote-tracking branch 'origin/master'

# Conflicts:
#	docs/app.min.js

Author: scniro

README.md

@@ -9,13 +9,12 @@ demo @ [scniro.github.io/react-codemirror2](https://scniro.github.io/react-codem
 
 > npm install react-codemirror2
 
-
 ## basic usage
 ```jsx
 import CodeMirror from 'react-codemirror2'
 
 <CodeMirror
-  value='I <3 react-codemirror2'
+  value='<h1>I ♥ react-codemirror2</h1>'
   options={{
     mode: 'xml',
     theme: 'material',
@@ -33,13 +32,12 @@ Since codemirror ships mostly unconfigured, the user is left with the responsibi
 > note that the base codemirror.css file is required in all use cases
 
 ```css
-// index.scss
 @import '~/node_modules/codemirror/lib/codemirror.css';
 @import '~/node_modules/codemirror/theme/material.css';
 ```
 
 ```jsx
-import CodeMirror from 'react-codemirror2'
+import CodeMirror from 'react-codemirror2';
 require('codemirror/mode/xml/xml');
 require('codemirror/mode/javascript/javascript');
 ```

docs/app.min.js

@@ -90,6 +90,7 @@ html, body, #app {
         h1 {
           font-size: 16pt;
           color: dodgerblue;
+          display: inline-block;
 
           &:hover {
             color: darken(dodgerblue, 20%);
@@ -110,7 +111,7 @@ html, body, #app {
     #pane-container {
 
       box-shadow: 0 4px 2px -2px #ccc;
-      height: 28em;
+      height: 30em;
 
       section {
         width: 50%;