added tmp to gitignore
Merge branch 'master' of github.com:davidjconnolly/jonsmusic