merge
added missing files for notes
merge conflict fix for lecture views, notes.js and added routes for notes
merge fix: views, routes