From: Dylan Lloyd <dylan@dylansserver.com>
Date: Wed, 13 Feb 2013 08:54:31 +0000 (-0500)
Subject: Merge branch 'mvc' into live
X-Git-Url: https://disinclined.org/git/?a=commitdiff_plain;h=950e73c8a7e3c2f2c4ff18b825d3cd0281afc693;p=dylansserver.git

Merge branch 'mvc' into live

Conflicts:
	includes/style.css
---

950e73c8a7e3c2f2c4ff18b825d3cd0281afc693