Background
Merge branch 'master' of https://github.com/thejosh223/pudgewars

Conflicts:
	src/pudgewars/components/Stats.java
	src/pudgewars/network/Client.java