Index file changed
Merge branch 'master' of https://github.com/kent-ma/ece356

Conflicts:
	build/web/index.jsp