Integrated robot into first level
Merge pull request #14 from nolanfilter/Nolan

Integrated robot into first level
Merge remote-tracking branch 'origin/master' into Geo

Conflicts:
	Assets/Scenes/Test.unity
	Assets/Scripts/Controllers/PlayerController.cs