updates to bosses
Merge branch 'master' of https://github.com/TEDdyB34R/CastleProject

Conflicts:
	Game.class