Merge remote-tracking branch 'origin/JimmyJam'

Conflicts:
	Assets/Art/Prefabs/Obstacles/FireJet.prefab
Cleanup
Reinforce selection screen agent colors
Merge pull request #41 from nolanfilter/Nolan

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

Conflicts:
	Assets/Art/Prefabs/Obstacles/FireJet.prefab