mouvements
Merge branch 'master' of https://github.com/sanzodown/clickerz

Conflicts:
	js/script.js