Merge branch 'master' into feature/gif

Conflicts:
	app/index.html
	app/scripts/controllers/viewer.js

Author: panrafal

Diff for: .gitignore

@@ -3,3 +3,4 @@ dist
 .tmp
 .sass-cache
 app/bower_components
+*.sublime-workspace

Diff for: README.md

@@ -7,17 +7,29 @@ Extracts depth map and original from photos made with Google Camera's Lens Blur.
 
 This is the source of the http://depthy.stamina.pl webapp. Contributions more than welcome!
 
-How to build
-============
+## How to build
 
 - Install node + npm
 - Run anywhere: `npm install -g grunt-cli bower`
 - Run in project directory: `npm install` and `bower install`
 - For local development server run: `grunt serve`
 - For deployment: `grunt build`
 
-License
-=======
+## Authors
+
+- [Rafał Lindemann](http://www.stamina.pl/) - idea, code, ux
+- [Łukasz Marcinkowski](http://th7.org/) - idea, help
+
+## How to help
+
+The current state is a weekend hack. I'm currently refactoring the app to make it more modular,
+so changes in API will be signifact. There's an inevitable design/ux overhaul down the pipeline.
+
+There is a lot of stuff you can do with depthmaps. If you have ideas and you know how to code,
+You already know how to help ;) I'm pretty lax on formalities, just make it work and at least 
+try to follow conventions of the code...
+
+## License
 
 The MIT License
 

Diff for: app/index.html

@@ -9,6 +9,7 @@
     <meta property="og:image" content="http://depthy.stamina.pl/preview.gif" />    
     <link rel="shortcut icon" href="favicon.png"/>
     <link rel="apple-touch-icon" href="favicon.png"/>
+    <meta property="fb:admins" content="1771078534" />
 
     <!-- build:css({.tmp,app}) styles/main.css -->
     <link rel="stylesheet" href="styles/icomoon.css">