Octopress init
Site updated at 2014-11-10 18:23:13 UTC
Site updated at 2014-12-10 16:02:22 UTC
Merge branch 'master' of https://github.com/mightmortal/mightmortal.github.io

Conflicts:
	atom.xml
	blog/2013/08/02/my-new-blog/index.html
	blog/2013/08/03/74294/index.html
	blog/2013/08/03/start/index.html
	blog/2013/08/04/78562/index.html
	blog/2013/08/05/-c-c/index.html
	blog/2013/08/06/c-locale-problems/index.html
	blog/2013/08/07/84091/index.html
	blog/2013/08/08/why-cpp/index.html
	blog/2013/08/09/go-lang-mnenie/index.html
	blog/2013/08/10/work-with-ogre/index.html
	blog/2013/08/11/kill-all-memleaks/index.html
	blog/2013/08/12/elementaryos-first-view/index.html
	blog/2013/08/13/ide-vs-editor/index.html
	blog/2013/08/14/select-rss-reader/index.html
	blog/2013/08/15/linuxs-minus/index.html
	blog/2013/08/16/87473/index.html
	blog/2013/08/17/87543/index.html
	blog/2013/08/18/using-git/index.html
	blog/2013/08/19/90010/index.html
	blog/2013/08/20/91717/index.html
	blog/2014/02/08/return/index.html
	blog/2014/05/04/linux/index.html
	blog/archives/index.html
	blog/categories/building/atom.xml
	blog/categories/building/index.html
	blog/categories/c-plus-plus/atom.xml
	blog/categories/c-plus-plus/index.html
	blog/categories/c/atom.xml
	blog/categories/c/index.html
	blog/categories/dvcs/atom.xml
	blog/categories/dvcs/index.html
	blog/categories/elementaryos/atom.xml
	blog/categories/elementaryos/index.html
	blog/categories/emulators/atom.xml
	blog/categories/emulators/index.html
	blog/categories/git/atom.xml
	blog/categories/git/index.html
	blog/categories/go/atom.xml
	blog/categories/go/index.html
	blog/categories/linux/atom.xml
	blog/categories/linux/index.html
	blog/categories/memleaks/atom.xml
	blog/categories/memleaks/index.html
	blog/categories/mercurial/atom.xml
	blog/categories/mercurial/index.html
	blog/categories/msvs/atom.xml
	blog/categories/msvs/index.html
	blog/categories/ogre/atom.xml
	blog/categories/ogre/index.html
	blog/categories/os/atom.xml
	blog/categories/os/index.html
	blog/categories/programing/atom.xml
	blog/categories/programing/index.html
	blog/categories/programming/atom.xml
	blog/categories/programming/index.html
	blog/categories/zamietki/atom.xml
	blog/categories/zamietki/index.html
	index.html
	posts/2/index.html
	posts/3/index.html
	sitemap.xml
	stylesheets/screen.css