fixing up client side
Merge branch 'master' of https://github.com/csherland/ducking-octo-hipster