add
change readme.txt
add feature vulcan
add b.txt
b.txt
Merge branch 'dev' of github.com:mayer2013/learngit into dev
add
a
b
bg
a
p
Merge branch 'dev'

aaappp