fresh octopuses
gitignore
Octopress init
Site updated at 2014-10-03 21:42:08 UTC
Merge branch 'master' of github.com:porchdotcom/porchdotcom.github.io
Site updated at 2014-10-03 21:45:06 UTC
blogging first steps
Merge remote-tracking branch 'origin/master'

Conflicts:
	Rakefile
	_config.yml
blogging first steps
Merge branch 'master' of https://github.com/porchdotcom/porchdotcom.github.io

Conflicts:
	_includes/blog_posts.html
	_includes/post_header.md
	_layouts/default.html
	_layouts/posts_list.html
	_posts/2014-09-18-hello-world.md
	index.md
	javascripts/main.js
	stylesheets/stylesheet.css