merge conflicts
merge conflicts
Merge pull request #26 from Jonga/home-page

Home page