test
Merge https://github.com/cenamy/cube_vid

Conflicts:
	js/main.js