Resolving merge conflicts
Merge branch 'display' of https://github.com/cposner/housing into display