Fix syncing

Commiting to sync
Merge branch 'master' of https://github.com/janvillarosa/web-echonotes

Conflicts:
	app/views/note.html