add new branch
f1
 master
conflicted fixed
add readme.txt
merge with --no-ff
fixed problem
fixed issue101
Merge branch 'master' of github.com:birdfreeboy/abc