updated home html
fixed merge conflict
Merge pull request #98 from LasseSviland/master

fixed merge conflict