damage
damage
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	GBJAM/Assets/Art/DaggerPix.ttf.meta
	GBJAM/Assets/Art/heart.png.meta