Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	.gitignore
	README.md