Whole lotta client code
Merge branch 'master' of https://github.com/Shimii/HW2