branch test
AND SIMPLE
& simple
conflict fixed
add merge
merge with no-ff
fix bug 101
merged bug fix 101
dev update readme & new home.html
ms verison after new home.html