Fixed corrupted theme
Merge branch 'master' of https://github.com/slb535/McKenzie-PTA-2013

Conflicts:
	functions.php