Create gh-pages branch via GitHub
merging master
fixed conflicts
Create README.md
resolve conflict