delete ALL
delete work/workfile.data
Merge branch 'master' of github.com:DanielDong/GitTest

Conflicts:
	Test.data
delete Test.data