Fucked something up
Merge branch 'master' of https://github.com/khearn/assignment10

Conflicts:
	register.php