resolving conflict
Merge branch 'master' of https://github.com/turkycat/NightReader
Added Asynchronous audio file loading, moved list to ListActivity
Added eject image, changed application base theme