Update README.md
added Derp
Update sign_in.html
this fixes a merge conflict
Merge pull request #4 from slraypole1993/fix-something

added Derp
Create drinkwaterinfo.html
Merge pull request #7 from slraypole1993/nathan's-branch

Nathan's branch