commit this
Merge branch 'master' of github.com:Killen1/mtw

Conflicts:
	wp-content/themes/mtw/header.php
	wp-content/themes/mtw/index.php