Shadow
Merge branch 'master' of https://github.com/Celcius/BrawlerOfPain

Conflicts:
	project/Assets/Resources/GenericPlayer.prefab
shadow