Merge branch 'master' of https://github.com/shzq/eece417

Conflicts:
	TestAppEngineProject/war/results.jsp