Some peer clean up
Merge branch 'master' of github.com:Gabbe1993/Network_Programming_With_Java
Some merges