added login and registration page, and set assets
resolved conflict
added assets login and registrations
resolve merge conflict