add test10
Merge branch 'master' of github.com:shrek82/studygit

Conflicts:
	test.txt