merge
merging into master
Merge branch 'dev'

version .1 to EC2
added missing files for notes
merge conflict fix for lecture views, notes.js and added routes for notes
merge fix: views, routes
small edit to ignore, removed ignore of entire db folder;
Merge branch 'dev' of https://github.com/damouse/Glassroom-Server into dev
merge fix