new branch dev
add new line in dev
new line in master
merge dev to master
fixed bug 001
fix bug
fixed bug
new thing
new feature