Add Registration and login functions
fixed conflicts
Add Registration and Login functions