my own stuff
Merge branch 'master' of https://github.com/choucalate/music

Conflicts:
	bin/MidiSheetMusic.apk
	bin/classes/com/midisheetmusic/TutorialMSActivity$1.class
	bin/classes/com/midisheetmusic/TutorialMSActivity$1TranslateAnim.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$NBNodes.class
	bin/classes/com/midisheetmusic/TutorialMSActivity.class
mystuff
Merge branch 'master' of https://github.com/choucalate/music

Conflicts:
	bin/MidiSheetMusic.apk
	bin/classes/com/midisheetmusic/TutorialMSActivity$7.class
	bin/classes/com/midisheetmusic/TutorialMSActivity$setupPiano.class
	bin/classes/com/midisheetmusic/TutorialMSActivity.class
	src/com/midisheetmusic/TutorialMSActivity.java
Merge branch 'master' of https://github.com/choucalate/music

Conflicts:
	bin/classes/com/midisheetmusic/TutorialMSActivity$7.class
	bin/classes/com/midisheetmusic/TutorialMSActivity.class
	src/com/midisheetmusic/TutorialMSActivity.java