Fixed login
Merge branch 'master' of https://github.com/aaplmath/aChat

Conflicts:
	login.php