lol
Merge branch 'master' of https://github.com/matYang/badstudentfrontend

Conflicts:
	.DS_Store
	scripts/view/messageDetailView.js