Replace master branch with page content via GitHub
Octopress init
Site updated at 2014-12-03 16:41:04 UTC
Merge branch 'master' of github.com:waltera/waltera.github.io

Conflicts:
	index.html
Site updated at 2014-12-03 16:43:25 UTC
Merge branch 'gh-pages' of github.com:waltera/waltera.github.io

Conflicts:
	atom.xml
	sitemap.xml
	stylesheets/screen.css