more stuff
Merge branch 'fpj/wip' of https://github.com/fryingpanjoe/big-battle-java into fpj/wip

Conflicts:
	big-battle-server/src/org/fryingpanjoe/bigbattle/server/Main.java
even more stuffs