dialog
settings
settings
dialog/settings/exit
Merge branch 'master' of https://github.com/kthuang90/pocketplayer.git

Conflicts:
	PocketPlayer/res/xml/preferences.xml
	PocketPlayer/src/edu/psu/ktwok/pocketplayer/SplashScreen.java
	PocketPlayer/src/edu/psu/ktwok/pocketplayer/TitleScreen.java