Re-init octopress.
Adding CNAME file.
Merge branch 'master' of github.com:justin-c-rounds/justin-c-rounds.github.com
Adding CNAME file.
Merge branch 'master' of github.com:justin-c-rounds/justin-c-rounds.github.com
Botched the location of the CNAME file.
Stop this blogging nonsense and just make a dumb website. Be happy.
Merge branch 'master' of github.com:justin-c-rounds/justin-c-rounds.github.com

Conflicts:
	atom.xml
	blog/2009/01/24/oh-ubuntu/index.html
	blog/2009/02/07/whats-wrong-with-wii-music/index.html
	blog/2009/04/09/your-quest-will-not-be-saved/index.html
	blog/2010/04/19/decorative-soaps/index.html
	blog/2010/06/15/quitting/index.html
	blog/2010/10/23/janes-6th-birthday-party/index.html
	blog/2010/10/30/mommy-and-baby-monsters/index.html
	blog/2010/10/31/happy-halloween/index.html
	blog/2010/11/09/maze-of-space/index.html
	blog/2010/11/11/(in-response-to)-david-vs.-goliathville:-a-call-to-arms-for-indie-social-game-designers/index.html
	blog/2011/06/18/charles-river/index.html
	blog/2011/07/03/berkshire-scenic-railroad/index.html
	blog/2011/12/11/detecting-the-intersection-of-two-lines-or-line-segments/index.html
	blog/2012/01/13/i-dont-believe-in-luck-anymore/index.html
	blog/2012/01/22/dig-deep-dungeons-update-stairs-and-torches/index.html
	blog/2012/02/02/html5-flash-stop-with-the-versus-already/index.html
	blog/2012/04/21/ludum-dare-23/index.html
	blog/2012/05/27/ludum-dare-#23-update!/index.html
	blog/2012/11/04/reason-and-madness/index.html
	blog/2012/11/22/(re)started-painting-(with-molly-sleeping)/index.html
	blog/2012/11/29/something-doing-something/index.html
	blog/2012/12/14/art-is-the-cry-of-distress-uttered-by-those-who-experience-at-first-hand-the-fate-of-mankind/index.html
	blog/2013/01/12/jspaddle-javascripting-on-the-ipad/index.html
	blog/2013/01/20/one-game-a-month-january-2013/index.html
	blog/2013/02/02/blogging-with-octopress/index.html
	blog/archives/index.html
	blog/page/2/index.html
	blog/page/3/index.html
	index.html
	sitemap.xml