James
Merge pull request #13 from nolanfilter/JimmyJam

James
Merge pull request #14 from nolanfilter/Nolan

Integrated robot into first level
added moving/rotating platforms and the fire control and prefab
Merge remote-tracking branch 'origin/master' into Geo

Conflicts:
	Assets/Scenes/Test.unity
	Assets/Scripts/Controllers/PlayerController.cs
Merge pull request #15 from nolanfilter/Geo

added moving/rotating platforms and the fire control and prefab
Added lasers to level one.
Merge pull request #16 from nolanfilter/JimmyJam

Added lasers to level one.
Merge branch 'master' of https://github.com/nolanfilter/ProjectDeath into Nolan