composite update
commit update
update
Composite update
slider and timer
Concurrency
concurrencey stuff
concurrency2
commit update
update
Composite update
slider and timer
merge
commit5
commit6
Merge branch 'master' into Composite

Conflicts:
	bin/MediaPlayer.apk
	bin/R.txt
	bin/classes.dex
	bin/dexedLibs/android-support-v4-7b804b619181af4e001546945cc680fa.jar
	bin/dexedLibs/android-support-v7-appcompat-0cead0f234236e758ce1a706540cb212.jar
	bin/dexedLibs/appcompat_v7-82e43b752b4d28dbabbb8c12c1273a78.jar
	bin/resources.ap_
	gen/com/example/mediaplayer/R.java
	res/layout/activity_main.xml
	src/com/example/mediaplayer/AudioPlayerActivity.java
	src/com/example/mediaplayer/ClassDiagram.ucls
	src/com/example/mediaplayer/FilesActivity.java
	src/com/example/mediaplayer/Song.java