V.1.0 - Major Update
Revert Functions
Merge branch 'master' of github.com:themesmith/primus
Conflicts:
	content.php
	framework/classes/class.background.php.old
	framework/classes/class.theme-options.php
	framework/global-setup.php
	framework/includes/core-functions.php
	framework/init.php
	functions.php
	head-nav.php
	head.php
	header.php
	setup.php