added styling to sign up and login page
fixed merge conflict
Merge pull request #6 from crotten/master

Styled sign up and log in page