Last fix was unsuccessful. Trying another.
Merge branch 'master' of https://github.com/JamieWohletz/easynote

Conflicts:
	scripts/coffee/Notebook.coffee
	scripts/js/Notebook.js