del .suo
Merge branch 'master' of https://github.com/pengmin/TeaShop

Conflicts:
	TeaShop.v11.suo
删除不用版本控制的文件