Tentative push

Hit marking for the boss character, maybe?
Merge remote-tracking branch 'origin/master'

Conflicts:
	gamerella2014/Assets/Scripts/Boss.cs