to pull
Merge branch 'master' of github.com:Nikkidbz/SiPoteris
fabien worst kennen eu
Merge branch 'master' of github.com:Nikkidbz/SiPoteris
Merge branch 'master' of github.com:Nikkidbz/SiPoteris
	pour pull
	lisght cookie deleted
Merge branch 'master' of github.com:Nikkidbz/SiPoteris
	to pull
Merge branch 'master' of github.com:Nikkidbz/SiPoteris

Conflicts:
	credits.js
Merge branch 'master' of github.com:Nikkidbz/SiPoteris
Merge branch 'master' of github.com:Nikkidbz/SiPoteris

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

Conflicts:
	Main.js
    hihi
Merge branch 'master' of github.com:Nikkidbz/SiPoteris

Conflicts:
	Main.js
  to pull
Merge branch 'master' of github.com:Nikkidbz/SiPoteris

Conflicts:
	text.js
Merge branch 'master' of github.com:Nikkidbz/SiPoteris
Merge branch 'master' of github.com:Nikkidbz/SiPoteris