updates
Merge branch 'login' of https://github.com/chscodecamp/web102.git into
login

Conflicts:
	php/signin.php