created note
Merge branch 'master' of github.com:wilsonpeng8/notenote

Conflicts:
	app/controllers/notes_controller.rb