Initial local commit
Merge branch 'master' of github.com:krogsgard/wporg-developer

Conflicts:
	content.php
	footer.php
	functions.php
	header.php
	index.php
	style.css