1.jekyll
Merge branch 'master' of https://github.com/teze/teze.github.io

Conflicts:
	.gitignore
	_config.yml
	_layouts/default.html
	_layouts/post.html
	index.html
1delete stuff