Finished client
Merge branch 'master' of github.com:CampusHacks/Smads