Create gh-pages branch via GitHub
Fix conflicts and refine the demo
Remove <<<<master
Add gh fork ribbon