修改杂7杂8
Merge branch 'master' of https://github.com/lovesunstar/MyTourGuide

Conflicts:
	MyTourGuide/Base.lproj/Main.storyboard
	MyTourGuide/Images.xcassets/Welcome/welcome.imageset/welcome@2x.png
	MyTourGuide/Images.xcassets/welcome.imageset/Contents.json