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

Conflicts:
	credits.js
	fabien quoi :):
Merge branch 'master' of github.com:Nikkidbz/SiPoteris
Merge branch 'master' of github.com:Nikkidbz/SiPoteris
Merge branch 'master' of github.com:Nikkidbz/SiPoteris
Merge branch 'master' of github.com:Nikkidbz/SiPoteris
   correction bug credits video