weather
weather second commit
gitignore commit
Merge branch 'master' of git@github.com:sidneyzhang/weather.git

Conflicts:
	.gitattributes