Fix
Fix
Merge branch 'master' of https://github.com/georgi-ivanov-tues/guitar_backing_track_generator_for_android

Conflicts:
	AndroidVersion/GuitarBackTrackGenerator/assets/backingTracks.csv
	AndroidVersion/GuitarBackTrackGenerator/bin/GuitarBackTrackGenerator.apk
	AndroidVersion/GuitarBackTrackGenerator/bin/classes.dex
	AndroidVersion/GuitarBackTrackGenerator/bin/classes/com/example/guitarbacktrackgenerator/CreditsMenu.class
	AndroidVersion/GuitarBackTrackGenerator/bin/classes/com/example/guitarbacktrackgenerator/FavouritesMenu.class
	AndroidVersion/GuitarBackTrackGenerator/bin/classes/com/example/guitarbacktrackgenerator/GenerateMenu$1.class
	AndroidVersion/GuitarBackTrackGenerator/bin/classes/com/example/guitarbacktrackgenerator/GenerateMenu$2.class
	AndroidVersion/GuitarBackTrackGenerator/bin/classes/com/example/guitarbacktrackgenerator/GenerateMenu$3.class
	AndroidVersion/GuitarBackTrackGenerator/bin/classes/com/example/guitarbacktrackgenerator/GenerateMenu$4.class
	AndroidVersion/GuitarBackTrackGenerator/bin/classes/com/example/guitarbacktrackgenerator/GenerateMenu$5.class
	AndroidVersion/GuitarBackTrackGenerator/bin/classes/com/example/guitarbacktrackgenerator/GenerateMenu$6.class
	AndroidVersion/GuitarBackTrackGenerator/bin/classes/com/example/guitarbacktrackgenerator/GenerateMenu$7.class
	AndroidVersion/GuitarBackTrackGenerator/bin/classes/com/example/guitarbacktrackgenerator/GenerateMenu$8.class
	AndroidVersion/GuitarBackTrackGenerator/bin/classes/com/example/guitarbacktrackgenerator/GenerateMenu.class
	AndroidVersion/GuitarBackTrackGenerator/bin/classes/com/example/guitarbacktrackgenerator/MainActivity.class
	AndroidVersion/GuitarBackTrackGenerator/bin/classes/com/example/guitarbacktrackgenerator/MusicPlayer.class
	AndroidVersion/GuitarBackTrackGenerator/bin/classes/com/example/guitarbacktrackgenerator/ParseCSV.class
	AndroidVersion/GuitarBackTrackGenerator/bin/classes/com/example/guitarbacktrackgenerator/R$id.class
	AndroidVersion/GuitarBackTrackGenerator/bin/classes/com/example/guitarbacktrackgenerator/R$layout.class
	AndroidVersion/GuitarBackTrackGenerator/bin/classes/com/example/guitarbacktrackgenerator/R$menu.class
	AndroidVersion/GuitarBackTrackGenerator/bin/classes/com/example/guitarbacktrackgenerator/R$raw.class
	AndroidVersion/GuitarBackTrackGenerator/bin/classes/com/example/guitarbacktrackgenerator/R$string.class
	AndroidVersion/GuitarBackTrackGenerator/bin/classes/com/example/guitarbacktrackgenerator/R$style.class
	AndroidVersion/GuitarBackTrackGenerator/bin/dexedLibs/android-support-v4-59caab3cd7d0fae208182d91f47b611d.jar
	AndroidVersion/GuitarBackTrackGenerator/bin/dexedLibs/jl1.0-5b31740fbcc996709e4cf85ec2dadb71.jar
	AndroidVersion/GuitarBackTrackGenerator/bin/resources.ap_
	AndroidVersion/GuitarBackTrackGenerator/gen/com/example/guitarbacktrackgenerator/R.java
	AndroidVersion/GuitarBackTrackGenerator/res/layout/activity_generate_menu.xml
	AndroidVersion/GuitarBackTrackGenerator/res/raw/c_minor_rock_ballad_guitar_backing_track.mp3
	AndroidVersion/GuitarBackTrackGenerator/res/raw/e_minor_sad_backing_track_acoustic_ballad.mp3
	AndroidVersion/GuitarBackTrackGenerator/src/com/example/guitarbacktrackgenerator/GenerateMenu.java
	AndroidVersion/GuitarBackTrackGenerator/src/com/example/guitarbacktrackgenerator/MusicPlayer.java