upgrading to WP 4.0
Merge branch 'master' of github.com:madebydavid/WordpressSkeleton

Conflicts:
	README.md