Oh god jesus
Made the sphere move
Merge remote-tracking branch 'origin/migration'

Conflicts:
	index.html