a new branch
master branch commit
and simple
& simple
conflict fixed
bug_101
merged bug fix 101
Merge branch 'master' of https://github.com/fhf1234567/fan