media controller stuff
Merge branch 'master' of https://github.com/tangurano/cs371m-mobile-computing
media controller stuff