Octopress init
Site updated at 2014-02-12 18:07:08 UTC
Merge branch 'master' of https://github.com/soltrain/soltrain.github.io

Conflicts:
	index.html
Merge branch 'master' of https://github.com/soltrain/soltrain.github.io
removed old hello world
Site updated at 2014-02-12 18:15:48 UTC