progress on client
Merge branch 'master' of https://github.com/DJTedMoney/Milestone3