adding file b.txt
Merge branch 'master' into gh-pages
deleted b.txt
adding c
Merge branch 'master' into gh-pages
with a lot of stuffs