add web fonts / update config for multisite
discard wordpress local changes
WAG updates
Fix theme reference
Merge branch 'master' of https://github.com/magnumcreative/wp-starter

Conflicts:
	wp-config.php