#5 completed notes controller tests
Merge branch 'master' into rename_notes_5

Conflicts:
	bin/www
	data.json
merged master into rename_notes_5
Merge pull request #6 from liquid-co-ops/rename_notes_5

closes #5 renamed notes to note, and completed notes crud