界面
工程解决冲突
mainviewcontroller
no message
Merge branch 'master' of https://github.com/LLCoder/ShoutIos

Conflicts:
	Shout/MainModel.h
	Shout/MainModel.m
	Shout/MainViewController.m
	Shout/ShareManager.h
	Shout/ShareManager.m
no message
no message
no message
删除文件
界面调整
bug fixed with merge code