Octopress init
Merge branch 'master' of github.com:dpippen/dpippen.github.io

Conflicts:
	index.html
Site updated at 2013-12-09 21:37:10 UTC