"commits before pull"
Merge branch 'master' of https://github.com/choucalate/music

Conflicts:
	bin/classes/com/midisheetmusic/ChooseSongActivity.class
	bin/classes/com/midisheetmusic/FileBrowserActivity.class
	bin/classes/com/midisheetmusic/MidiSheetMusicActivity.class
	bin/classes/com/midisheetmusic/SPPlayer$1.class
	bin/classes/com/midisheetmusic/SPPlayer.class
	bin/classes/com/midisheetmusic/SheetMusicActivity.class
	bin/classes/com/midisheetmusic/TutorialMSActivity$11.class
	bin/classes/com/midisheetmusic/TutorialMSActivity$12.class
	bin/classes/com/midisheetmusic/TutorialMSActivity$pianoAsync.class
	bin/classes/com/midisheetmusic/TutorialMSActivity.class
	src/com/midisheetmusic/SPPlayer.java
ready to add beatz