started with registration and login process
merged conflicts