fixed bugs in user registration.
fixed conflicts
Merge branch 'master' of https://github.com/clarissaestremos/CMSC_128_AB2L
Fix merge conflicts.