注释
Merge branch 'master' of https://github.com/swtlovewtt/yikoudai into caow
Merge branch 'caow' of https://github.com/swtlovewtt/yikoudai into caow

Conflicts:
	YiKouDai/YiKouDai/UI/VC/MyBuyVC.m
新分支
Merge branch 'songwt' of https://github.com/swtlovewtt/yikoudai into caow
ignore文件
ignore
侧栏的点击事件
待评论订单详情界面
homecell
Merge branch 'songwt' of https://github.com/swtlovewtt/yikoudai into caow

Conflicts:
	YiKouDai/YiKouDai/UI/VC/MyProfileViewController.xib
xib 用xcode4.6打开