Merge branch 'master' into buildtesting

Conflicts: README.md
setpixel · Aug 20, 2015 · b50c157 · b50c157
1 parent 2160cb6
commit b50c157
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 Outliner
 ============
 
-<img align="right" src="https://raw.githubusercontent.com/setpixel/outliner/master/chromestore/icon_256.png">
+<img align="right" style="padding-left: 30px; width: 100px;" src="https://raw.githubusercontent.com/setpixel/outliner/master/chromestore/icon_256.png">
 
 Quickly outline the shit out of some stuff!
 
@@ -17,4 +17,5 @@ COMMAND+ Arrow: change order
 ```
 
 I'm writing this in all vanilla JS, trying not to use any backend code.
+
 I'm using Google Drive Realtime API, and AWS SDK.