branch test
and simple
AND simple
solve conflict
fix #1 bug
merge bug #1
confused
another directory
Merge branch 'master' of github.com:linuxholic/learngit

just for test.
Merge branch 'dev' of github.com:linuxholic/learngit into dev

pull again
Merge branch 'master' of github.com:linuxholic/learngit into dev