Joe's test
Merge branch 'master' of https://github.com/jcbator/proj4

Conflicts:
	src/database.txt
	src/proj4/BattleClass.java
	src/proj4/EnemyTurn.java
	src/proj4/Game.java
	src/proj4/LevelMap.java
	src/proj4/Sparty.java
	src/proj4/Sprite.java
	src/proj4/server/ClientDemo.java
	src/proj4/server/GameClient.java
	src/proj4/server/ServerDemo.java