Merge branch 'master' of https://github.com/TheoPipaud/Invinity

Conflicts:
	js/script.js
merge