house doesn't have the text thing appear above it anymore
merge conflicts
Merge branch 'master' of https://github.com/danmartelly/SugarRush