add 123
add 456
Merge branch 'dev' of github.com:karl-wxw/learngit into dev

Conflicts:
	test.txt
Merge pull request #1 from karl-wxw/dev

Dev