Merge pull request #21 from ScioMx/user_login

User login
Merge branch 'master' into styling_index_page
Update styles and tests