remove Jekyll generated files
Merge branch 'master'

Conflicts:
	.gitignore
clean the merge conflict