added a nojekyll file
adding another h1
Merge branch 'gh-pages'

resolved a conflict in: index.html