Merge branch 'evaluation' into Aaron-Flores
Merge branch 'evaluation' into DJ-Balane
Merge branch 'evaluation' into Jon-Antolin
Merge branch 'evaluation' into Joseph-Allison
Merge branch 'evaluation' into Marques-Stone
Merge branch 'evaluation' into Ryan-Haglund
Added Healthbars
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
MoveAround Script

Script for player movement (tutorial)
Committing changes before pre merge
Merge branch 'Parker' into evaluation

Conflicts:
	ProjectSettings/Physics2DSettings.asset
AI Trials

Test Scripts for AI
Merge branch 'Jon-Antolin' into evaluation
Merge branch 'Joseph-Allison' into evaluation
Merge branch 'DJ-Balane' into evaluation