Trash functionality works
Merge branch 'master' of https://github.com/kgpasta/omnijam
Finalized code for assignment 5