no message
Merge branch 'master' of https://github.com/rkyouth/HiShow

Conflicts:
	hishow.xcodeproj/project.pbxproj