messing with js
fixed conflict
Merge branch 'master' into weather
weather formatting
Merge pull request #17 from ricarora/weather

Weather