commit before merge
Merge branch 'master' of http://github.com/Ani3DWeb/canvasino

Conflicts:
	webgl/RubikGame.js