fixed login issue.
Merge branch 'master' of https://github.com/khangsile/e_commerce

Conflicts:
	index.php
	login.php