Cherry-picking commit that I made on the wrong branch.
Merge branch 'master' into visual_effects

Conflicts:
	Assets/Scenes/Beta Build.unity
Merge pull request #151 from ModSquadWorkshop/visual_effects

Player and Boss Size