added nojekyll
lerning solving conflicts
Merge remote-tracking branch 'origin/gh-pages'