notes
Merge branch 'master' of https://github.com/ashriths/campus-connect

Conflicts:
	student/index.php
	student/notes.php