client model
merging
Merge branch 'master' of https://github.com/cposner/housing