Reads from disk
Merge branch 'master' of https://github.com/consindo/notes

Conflicts:
	coffeescript/app.coffee
	javascript/app.js