styled the new user page
fixed merge conflict in styles.css.scss
Merge branch 'user_new'

Fixed conflict in styles.css