Renamed files for consistency's sake.
Merge branch 'master' of https://github.com/nickgn12/android-music-sync-daemon