puppet module generate
Merge branch 'master' of github.com:ryayon/puppet-jekyll

Conflicts:
	README.md