from dsktp
Merge branch 'master' of github.com:franzwcom/mywordpress

Conflicts:
	footer.php
	functions.php
	header.php