merging master
yo
yo
notes factory
Merge branch 'master' of https://github.com/mfbadr/notetaker-1
sql query
notes to scope
Merge branch 'master' of https://github.com/mfbadr/notetaker-1 into sarah
added styling to listNotes jade