Changes
Ugh
Merge branch 'master' of https://github.com/FoolsRun/outerpeace-2014

Conflicts:
	custom-post-types/sliders.php
	external/.DS_Store
Stupid
asdf