fixed trashcan
Merge branch 'master' of github.com:newenegue/peek_frontend into ellie_friday2b