fix weather api.
Merge branch 'master' into weather-api
link wunderground api to app.
Merge pull request #33 from jsmit032/weather-api

Weather api
merge with master and fixed merge conflict