test commit
text
Merge branch 'master' of git@github.com:uunchpgney/KillBoss.git

Conflicts:
	KillBoss/src/com/ntut/killboss/object/ObjectSkill.java