WP - START

WP - START - root root
Merge branch 'master' of https://github.com/cjedmondson/EdmondsonWebsite

Conflicts:
	wp-config.php