Fixed bugs
Login.php
Merge branch 'master' of https://github.com/terraflops/SampleSite

Conflicts:
	login.php
f