Finished adding notes
Merge branch 'master' of https://github.com/jenniferchen/Music-App

Conflicts:
	app/controllers/notes_controller.rb