start work on branch dev
add readme
simple
quick & simple
conflict fixed
edited on Feature1 branch
edited on master branch
merge with no-ff
fix bugs
fix bug:issue-001
merged bug fix 001