login and register page added
Merge branch 'master' of https://github.com/Woildan/info153-final-project

Conflicts:
	register.php