weather API calls working
Merge branch 'master' of https://github.com/rossnanop/wunderground-music

Conflicts:
	.music.py.swp
	music.py