sign up code added
commit after resolving conflicts