reset
Merge branch 'master' of https://github.com/dmeearm/dmeearm.github.io

Conflicts:
	_layouts/default.html
	js/post.js