Testing 4
Merge branch 'new-branch'

Conflicts:
	js/studentPortal.js