Merge pull request #1 from jonasmargraf/master

created first index.html
trying this merging thing