new post
Merge branch 'master' of https://github.com/qikh/qikh.github.io

Conflicts:
	_site/atom.xml