merge without fast forward
fix bug 101
merge bug fix 101
helloworld
confilct
conflict fixed
add js.js
merge add js.js
update js.js