merging upstream
merging upstream
my attempt at fixing scss merge conflicts
fixed merge conflict
removing signin drop down styling to see if it will make the drop down work in heroku
taking out drop down sign in, replacing with link to sign in page
Merge pull request #48 from jeromeall/master

Removing Sign In drop down