检错
Merge branch 'master' of ssh://github.com/zytone/weather

Conflicts:
	.DS_Store