conflict fix???
fixd
Merge pull request #11 from RomeshPanditha/HarrisonDempsey-master

conflict fix???
fixed
Merge branch 'master' of https://github.com/RomeshPanditha/houseMate
woah
Merge pull request #7 from RomeshPanditha/master

Merge back into personal fork