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

Styled sign up and log in page
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/Team4
a