Added user registration and login
Changed Users Controller Merge Conflicts