Merge branch 'front'
Merge branch 'master' of https://github.com/hack4reno2013/housemind
Merge branch 'front'
Merge branch 'master' of https://github.com/hack4reno2013/housemind
updated .gitignore