start Boss
Merge remote-tracking branch 'origin/master'

Conflicts:
	boss1.png
	cGame.h