Merge pull request #66 from CarolineCC/home2

Home2
Merge branch 'master' of github.com:CarolineCC/mashe into home2