okay
Merge branch 'master' of https://github.com/paymonp/facebook3d

Conflicts:
	src/cubes.js