just commit
Merge branch 'master' of https://github.com/Cration/cration.github.io

Conflicts:
	_posts/2014-01-22-linux-kfifo.md