Merge origin/DS-COMP231S63G3 into DS-COMP231S63G3

Conflicts:
	web/process/loginProcess.jsp
Merge pull request #48 from COMP231-S63G3/DS-COMP231S63G3

Ds comp231 s63 g3