quicksave
Basic Combat Implemented
Merge remote-tracking branch 'origin/develop-kyle' into staging

Conflicts:
	Assets/Scenes/default.unity
	ProjectSettings/TagManager.asset
updating
Updating
Fixed?
FIXED!