fuck you science
Merge branch 'master' of https://github.com/doylezdead/keyshare

Conflicts:
	bin/client/Client.class
	bin/client/ClientListener.class
	bin/client/InputReader.class
	bin/client/MapGUI.class
	bin/server/ServerGUI.class
	src/client/Client.java
	src/client/InputReader.java
	src/server/ServerGUI.java