Basic render function & refactor
Merge branches 'master' and 'master' of https://github.com/consindo/notes

Conflicts:
	coffeescript/app.coffee