Merge pull request #24 from stuycs-softdev/shreya

Shreya
Merge pull request #25 from stuycs-softdev/shreya

Made the sign in buttons look a lot prettier
changed stuff
Merge pull request #26 from stuycs-softdev/master

pulling master into my branch