The red pill has been taken...
Merge branch 'master' of https://github.com/Con-Man/farmers-project

Conflicts:
	wp-content/themes/farming/content-none.php
	wp-content/themes/farming/settings.css
	wp-content/themes/farming/settings.scss
	wp-content/themes/farming/style.css