Added server, added status messages to client
Merge branch 'master' of https://github.com/smockle/dicey

Conflicts:
	client