修正
Merge remote-tracking branch 'origin/master'

Conflicts:
	Enemy.h
	Object.h
	Shot.h
	Unit.h