added notes to contacts
fixed but in notes.rb
added notes controller
reorganised routes.rb
fixed merge conflicts