Updated
Merge branch 'origin/jeff'

Conflicts:
	bin/BattleScreen.class
	bin/GamePortal.class
	src/BattleScreen.java
	src/GamePortal.java