asdf
Merge pull request #7 from stuycs-softdev/Simon

Simon
Merge branch 'master' of https://github.com/stuycs-softdev/proj3-6-JJTS
css doesnt work?
fixed merge issues with login.html