Settings

I think I was able to merge everything correctly. I just ran the app on the emulator, also.
Didn't see the media player Kevin built, but everything else seemed fine.

Biggest, obvious problem: There is no settings button in this version, unless there is some sort of sliding menu (drawer? not sure what those are called).

Was this button supposed to be implemented by Ryan?

Anyway, hopefully this is all okay. If it is not, we will take care of it today in class, I suppose.