Change input to a form
Merge branch 'master' of https://github.com/brishin/notes

Conflicts:
	client/views/note-list.js