Added login and register
resolved conflicts