gros merdier
Merge branch 'master' of https://github.com/Woreck/Runner_Slash

Conflicts:
	js/level.js
	js/main.js
	js/objects.js