Testing commit
Merge branch 'master' of https://github.com/mperr/MGS_Project

Conflicts:
	index.html