This is a new one
quick and simple
quick & simple
conflict fixed
add merge
merge with no-ff
fix bug 101
merged bug fix 101
commit all
bug 102 fixed
fix bug102
Merge branch 'master' of https://github.com/kimishi/gitlearn
Merge branch 'dev'