work on home page, sign in/sign up, qualities
work on home page, sign in/sign up, qualities
fixed merge conflict