Refactoring, began adding boss ginger firepower

Quick commit to sync up
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	Assets/_Scenes/Main.unity
merge conflit resolution