changes from yesterday. trying to get gui working again with the new
JONAS setup
Merge branch 'master' of https://github.com/jdd2405/Error404.git

Conflicts:
	Der grosse
Dalmuti/bin/ch/fhnw/error404/DerGrosseDalmuti/client/Client.class
	Der grosse
Dalmuti/src/ch/fhnw/error404/DerGrosseDalmuti/client/Client.java