Player Dies fighting boss doesn't work 8:59

Work in progress
Merge remote-tracking branch 'origin/master'

Conflicts:
	CreepyChristmas/Boss.java
	CreepyChristmas/Health.java
	CreepyChristmas/package.bluej