fonction de transition camera 2d 3D et maj du main
Merge branch 'master' of github.com:Nikkidbz/SiPoteris

Conflicts:
	Main.js
	Transition2D3D.js