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

Conflicts:
	Assets/Scripts/GameManager.cs
	Assets/Textures/walls-lollipop-14.png.meta
	Assets/Textures/walls-lollipop_wall1.png.meta