all commit

commit 2

commit 5
Merge branch 'work' of github.com:qtang3/test1 into work

Conflicts:
	data.txt