fixing home controller merge conflicts
Merge pull request #17 from eatsafe-sa/travtex

fixing home controller merge conflicts