I edit the index file
Merging conflicts
Merge branch 'berkunis-gh-pages' into gh-pages