Life Changes.
Merge branch 'master' of https://github.com/thejosh223/pudgewars.git

Conflicts:
	src/pudgewars/network/Client.java