test
	pour pull
Merge branch 'master' of github.com:Nikkidbz/SiPoteris

Conflicts:
	createSphericMesh.js
	videoSettings.js
 pour pull!!!
Merge branch 'master' of github.com:Nikkidbz/SiPoteris

Conflicts:
	Main.js
	Transition2D3D.js