old version
Merge branch 'master' of github.com:Amxx/MSE

Conflicts:
	index.html
	ressources/data.json
	ressources/engine.js
	ressources/style.css