fixed home page
Merge branch 'master' of https://github.com/Vincentvjj/info343Final

Conflicts:
	static/index.html