inclass test
Merge branch 'master' of https://github.com/markbosz/GitHub

Conflicts:
	Teamwork/Assets/Scripts/GameControllerScript.cs
	Teamwork/Assets/_Scenes/gamescene.unity
	Teamwork/Assets/prefabs/gameCube.prefab
whats happening