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

Conflicts:
	project/Assets/Scripts/Player.cs