added user login and sign up
Merge branch 'master' into ariana
Merge pull request #13 from kiopelani/ariana

added user login and sign up