added login and register screen
Merge remote-tracking branch 'origin'