Initial commit
first  commit
first  commit
Create gh-pages branch via GitHub
Merge branch 'gh-pages'

Conflicts:
	index.html
Merge remote-tracking branch 'origin/master'
Merge branch 'gh-pages'

Conflicts:
	index.html
Merge branch 'gh-pages'

Conflicts:
	index.html
Merge branch 'gh-pages'

Conflicts:
	index.html
Merge branch 'gh-pages'

Conflicts:
	index.html
Merge branch 'gh-pages'

Conflicts:
	index.html
config
config
config
config  git
config  git
config  git
config  git
Merge remote-tracking branch 'origin/master'
config  git