AND simple
& simple
conflict fixed
add merge
merge with no--ff
fix bug 101
merge bug fix 101]
bug is ok
issue-101 bug is ovwer
add gitlgnore file
Merge branch 'dev'