styled login page
Merge branch 'collab/erick227' into dev
Merge branch 'dev'