delete ~ file
Merge branch 'master' of github.com:paperplane/paperplane.ruhoh.com