This is my first commit ever
Merge branch 'master' of github.com:ganye/trashbox