changes made
Merge branch 'master' of https://github.com/irvingtan/CS3750

Conflicts:
	Workspace/CS 3570/WebContent/index.jsp
commit