THE WORLD NEEDS MY HELP SON!
Merge remote-tracking branch 'theotherone/master'

Conflicts:
	Assets/CubeScript.cs