Player changes color to match color blocks
Merge branch 'master' of https://github.com/Sixtoe/ModdingFinal

Conflicts:
	Assets/Scenes/testlevel.unity