Merge branch 'master' of https://github.com/mjhart/Homies

Conflicts:
landingpage.html