balance changed
Merge branch 'master' of https://github.com/LuckyMarq/collide

Conflicts:
	values/map.xml