delete file
edit file
Merge branch 'master' of https://github.com/davansy/pbb