first commit for github pages
resolving conflicts
more conflicts
Merge branch 'gh-pages'