mixes edits
Merge branch 'master' of github.com:s3ththompson/future-tapes