commit
commit

Conflicts:
	BasicApplication/.idea/workspace.xml

BasicApplication/out/artifacts/MusicAtYourFingerTips_jar/BasicApplicatio
n.jar
	BasicApplication/out/production/BasicApplication/AudioTrack.class
	BasicApplication/out/production/BasicApplication/Exe.class
	BasicApplication/out/production/BasicApplication/Itunes$1.class
	BasicApplication/out/production/BasicApplication/Itunes$Genre.class

BasicApplication/out/production/BasicApplication/Itunes$QueryTypes.class
	BasicApplication/out/production/BasicApplication/Itunes.class
	BasicApplication/out/production/BasicApplication/JBrowser.class
	BasicApplication/out/production/BasicApplication/JMediaPlayer.class
	BasicApplication/out/production/BasicApplication/MP3DownLoader$1.class
	BasicApplication/out/production/BasicApplication/MP3DownLoader$2.class
	BasicApplication/out/production/BasicApplication/MP3DownLoader.class
	BasicApplication/out/production/BasicApplication/Main.class
	BasicApplication/out/production/BasicApplication/Settings.class
	BasicApplication/out/production/BasicApplication/SongData.class
	BasicApplication/out/production/BasicApplication/Status.class
	BasicApplication/out/production/BasicApplication/URLReader.class