balance
Merge branch 'master' of https://github.com/mdirienzo/CandyJam

Conflicts:
	Assets/Scripts/GameManager.cs