changed header and login
Merge remote-tracking branch 'origin/chris' into Cody
Fix comment
Merge remote-tracking branch 'origin/Cody' into chris

Conflicts:
	politickr13/templates/header.php