Fixed some shizzle in client
Merge branch 'master' of github.com:jsfr/Advanced-Java-Programming