Initial commit
Merge branch 'master' of github.com:mimeiners/mimeiners.github.io into source
Initial Octopress setup
site updated
Clean up
Merge branch 'source' of github.com:mimeiners/mimeiners.github.io into source

Conflicts:
	_config.yml
	public/atom.xml
	public/blog/archives/index.html
	public/index.html
	public/sitemap.xml
	public/stylesheets/screen.css
	sass/base/_theme.scss
	source/_includes/custom/head.html