branch test
add practice branch
add simple
add a new line
comflict fixed
add branch management
merge with no-off
fix bug 101
merge bug fix 101
dev branch completed
fix dev branch comflict