Merge branch 'evaluation' into Ryan-Haglund
Merge branch 'Parker' into Ryan-Haglund
Merge branch 'evaluation' into Ryan-Haglund
bars position change
Adding InGame UI

Conflicts:
	Assets/Prefabs/Planets/Planet.prefab
Merge branch 'evaluation' into Joseph-Allison