Fixed buffer overflow
Merge branch 'c++' of git://github.com/Nebual/neballer into c++
Removed reference to mp3's, since they are not used