remise a 0 des plans, arret quand GUI
Merge branch 'master' of github.com:Nikkidbz/SiPoteris

Conflicts:
	Main.js
	moveSurface.js
	videoSettings2.js