small changes

only nessesary bc i want to sync ur new stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	CombatNode.java