Merge pull request #39 from nolanfilter/Geo

Geo
no message
Merge remote-tracking branch 'origin/JimmyJam'

Conflicts:
	Assets/Art/Prefabs/Obstacles/FireJet.prefab
Cleanup
Merge pull request #41 from nolanfilter/Nolan

Reinforce selection screen agent colors
Reinforce selection screen agent colors
Merge branch 'master' of https://github.com/nolanfilter/ProjectDeath into JimmyJam

Conflicts:
	Assets/Art/Prefabs/Obstacles/FireJet.prefab
Merge branch 'master' of https://github.com/nolanfilter/ProjectDeath into JimmyJam

Conflicts:
	Assets/Art/Prefabs/Obstacles/FireJet.prefab
Merge pull request #42 from nolanfilter/Geo

button test
Merge branch 'Geo' of https://github.com/nolanfilter/ProjectDeath into Nolan
Merge branch 'master' of https://github.com/nolanfilter/ProjectDeath into Nolan
Merge pull request #43 from nolanfilter/Geo

Button and Door linked
Merge branch 'master' of https://github.com/nolanfilter/ProjectDeath into Nolan
Fixed Selection Screen color bug
Updated player movement functions
Minor tweak to agents prefab
Merge pull request #44 from nolanfilter/Nolan

SelectionScreenAgent tweaks and PlayerController movement refactor
Merge branch 'master' of https://github.com/nolanfilter/ProjectDeath into JimmyJam
heyo
Merge pull request #45 from nolanfilter/JimmyJam

Jimmy jam