new reset
Merge branch 'master' of https://github.com/cr0hn/blog

Conflicts:
	_config.yml
	index.html