add newFile
remote newFile
add line readme.txt
& simple
add merge
merge with no-ff
fix bug 101
merged bug fix 101