playing around with index.html
fixed merge conflicts
Merge pull request #14 from michaelohm/index_page

Index page