finished NotesController
merged..