update readme
merge without --no-ff
add file1
add file2
add html
add js
Merge branch 'testing'
update is
update html1
Merge branch 'testing'
update html2
update html1
update html2
merge conflict