Wrapped up.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/Scene1.unity
	Assets/Scripts/GameHandler.cs