Correction Zoom 3D
Merge branch 'master' of github.com:Nikkidbz/SiPoteris
zerthjgjkgdfs bonnjour
Merge branch 'master' of github.com:Nikkidbz/SiPoteris

Conflicts:
	Console.js
	Transition2D3D.js
	videoSettings.js
Merge branch 'master' of github.com:Nikkidbz/SiPoteris

Conflicts:
	FullScreen.js