Merge branch 'evaluation' into Aaron-Flores
Merge branch 'evaluation' into DJ-Balane
Merge branch 'evaluation' into Joseph-Allison
Merge branch 'evaluation' into Marques-Stone
Merge branch 'evaluation' into Parker
Merge branch 'evaluation' into Ryan-Haglund
Merge branch 'evaluation'
Finally got proper loading of the world....

next step is going to be optimization of the loading so that
1) it doesn’t load all 10k plus objects at 1 time
2) add variance to the type of asteroid that is being spawned in.
removing the world gen slowdown
Editor Settings Change

Adding the Main menu scene and in-game scene to build settings
Merge branch 'Parker'
Added Healthbars
finished saving the worlds to 1 file

now the menu guys can pull all the world info from a short little xml
file.
deleted unused data
Merge branch 'master' into Parker
Merge branch 'master' into Ryan-Haglund

Conflicts:
	Assets/Editor/SaveData.meta
	Assets/Scripts/Ryan/UnusedScripts.meta
	Assets/Sources.meta
	CSE455-Salvage.userprefs
	ProjectSettings/Physics2DSettings.asset
	ProjectSettings/TagManager.asset
Adding a game manager
Merge branch 'Parker' into evaluation
Merge branch 'Ryan-Haglund' into evaluation
Merge branch 'Aaron-Flores' into evaluation