Added warning
Modified content on develop
Merge branch 'origin/scary_feature'

Conflicts:
	wp-content/themes/twentyfourteen/content-none.php
Merge branch 'origin/develop'