tests
Merge branch 'master' of github.com:rmcgibbo/mixtape into command-line-tests
couple things
trailing whitespace
Merge pull request #57 from rmcgibbo/command-line-tests

Command line tests