Dockerfile
Merge branch 'master' of https://github.com/cristianokbc/centos7-jekyll

Conflicts:
	Dockerfile