Test pull
Merge branch 'master' of https://github.com/UXYann/bigs

Conflicts:
	2/scripts/all.js
	2/scripts/mainWhite.js