commit before merger
Merge branch 'master' of github.com:halldorel/tebert into wip-kreld
Different coloured cubes
color changing magic
Merge branch 'master' into wip-kreld

Conflicts:
	shadedCube.js