MusicActivity Changes
Merge branch 'master' of https://github.com/freddysalinas801/RoadTrip

Conflicts:
	RoadTrip/RoadTrip/src/com/roadtrip/MusicActivity.java