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  git
config  git
config  git
Merge remote-tracking branch 'origin/master'