RomeshPanditha/houseMate — pull request #19 by HarrisonDempsey (2014-11-02 12:33:44+00:00)
Title: Merge into master

Merge back into personal fork