Notification update
Merge branch 'master' of https://github.com/Minkey27/StudeBook

Conflicts:
	APP/static/templates/main/nav.html