made user login page
Merge branches 'master' and 'testing'