add  4
add 1
Merge branch 'master' of https://github.com/wearoeric/git0604-1

Conflicts:
	test.txt