Test ThriftShop tutorial added
Merge branch 'master' of https://github.com/choucalate/music

Conflicts:
	bin/MidiSheetMusic.apk
	bin/classes/com/midisheetmusic/LevelActivity.class
	bin/classes/com/midisheetmusic/TutorialMSActivity$1.class
	bin/classes/com/midisheetmusic/TutorialMSActivity$10.class
	bin/classes/com/midisheetmusic/TutorialMSActivity$2.class
	bin/classes/com/midisheetmusic/TutorialMSActivity$3.class
	bin/classes/com/midisheetmusic/TutorialMSActivity$4.class
	bin/classes/com/midisheetmusic/TutorialMSActivity$5.class
	bin/classes/com/midisheetmusic/TutorialMSActivity$6.class
	bin/classes/com/midisheetmusic/TutorialMSActivity$7.class
	bin/classes/com/midisheetmusic/TutorialMSActivity$8.class
	bin/classes/com/midisheetmusic/TutorialMSActivity$9.class
	bin/classes/com/midisheetmusic/TutorialMSActivity$NBNodes.class
	bin/classes/com/midisheetmusic/TutorialMSActivity$pianoAsync.class
	bin/classes/com/midisheetmusic/TutorialMSActivity.class
	bin/res/drawable-hdpi/actionbar_background.png
	bin/res/drawable-hdpi/actionbar_compat_background.9.png
	bin/res/drawable-hdpi/events_default.png
	bin/res/drawable-hdpi/events_pressed.png
	bin/res/drawable-hdpi/events_selected.png
	bin/res/drawable-hdpi/facebook_logo.png
	bin/res/drawable-hdpi/friends_default.png
	bin/res/drawable-hdpi/friends_pressed.png
	bin/res/drawable-hdpi/friends_selected.png
	bin/res/drawable-hdpi/ic_launcher.png
	bin/res/drawable-hdpi/icon.png
	bin/res/drawable-hdpi/messages_default.png
	bin/res/drawable-hdpi/messages_pressed.png
	bin/res/drawable-hdpi/messages_selected.png
	bin/res/drawable-hdpi/news_feed_default.png
	bin/res/drawable-hdpi/news_feed_pressed.png
	bin/res/drawable-hdpi/news_feed_selected.png
	bin/res/drawable-hdpi/photos_default.png
	bin/res/drawable-hdpi/photos_pressed.png
	bin/res/drawable-hdpi/photos_selected.png
	bin/res/drawable-hdpi/pianoicon.png
	bin/res/drawable-hdpi/places_default.png
	bin/res/drawable-hdpi/places_pressed.png
	bin/res/drawable-hdpi/places_selected.png
	bin/res/drawable-ldpi/icon.png
	bin/res/drawable-mdpi/icon.png
	bin/res/drawable/bass.png
	bin/res/drawable/blue_note.png
	bin/res/drawable/directoryicon.png
	bin/res/drawable/eight.png
	bin/res/drawable/fastforward.png
	bin/res/drawable/four.png
	bin/res/drawable/icon.png
	bin/res/drawable/locked.png
	bin/res/drawable/main_background.png
	bin/res/drawable/menu_refresh.png
	bin/res/drawable/nine.png
	bin/res/drawable/notepair.png
	bin/res/drawable/orange_note.png
	bin/res/drawable/pause.png
	bin/res/drawable/pianobckgd1.png
	bin/res/drawable/play.png
	bin/res/drawable/rewind.png
	bin/res/drawable/six.png
	bin/res/drawable/stop.png
	bin/res/drawable/three.png
	bin/res/drawable/treble.png
	bin/res/drawable/twelve.png
	bin/res/drawable/two.png
	bin/res/drawable/unlocked.png
	src/com/midisheetmusic/LevelActivity.java
	src/com/midisheetmusic/TutorialMSActivity.java
Merge branch 'master' of https://github.com/choucalate/music