password twice in registration
Merge branch 'master' of https://github.com/TSA-HCI573/PetProject into Steven

Conflicts:
	register.php