updating server now functional. fixed peerror in ServerParser.java
Merge branch 'master' of https://github.com/WeHeartGaming/Codename-WHIRC

Conflicts:
	WHIRC/src/no/whg/whirc/helpers/ServerParser.java

Re-fixed Peerror