add abc.xx
master add abc.xx
Merge branch 'trunk'

Conflicts:
	abc.xx
use trunk before master
Create README.md
add hello.txt
modified in gitrep2
modified in gitrep
Merge branch 'master' of https://github.com/leeweo/test
Merge branch 'exp' of https://github.com/leeweo/test into exp