修改一些东西
Merge branch 'master' of https://github.com/lovesunstar/MyTourGuide

Conflicts:
	MyTourGuide.xcodeproj/project.pbxproj