[Lol] Commit
Merge branch 'master' of https://github.com/doriancami/TestHetic

Conflicts:
	index.html