gem install github-pages
Merge branch 'master' of github.com:ontouchstart/docker-jekyll-base

Conflicts:
	Dockerfile