fix conflicts
changes descriptive and stuff
update
Merge pull request #21 from Jonga/home-page

Home page