small change to login.php
Merge branch 'master' of https://github.com/caleb-carroll/havyaka_culture

Conflicts: merged
	login.php