git ignore updated for matlab generated files
Merge branch 'master' into file-import
mp3 encoding added