delete ts

删除项目
Merge remote-tracking branch 'origin/master'

Conflicts:
	topshoot/css/style.css