finished merging
Merge branch 'master' of https://github.com/choucalate/music

Conflicts:
	bin/MidiSheetMusic.apk
	bin/R.txt
	bin/classes/com/actionbarsherlock/R$layout.class
	bin/classes/com/actionbarsherlock/R$styleable.class
	bin/classes/com/midisheetmusic/AndroidDashboardDesignActivity.class
	bin/classes/com/midisheetmusic/Beats_Activity.class
	bin/classes/com/midisheetmusic/ColorPreference.class
	bin/classes/com/midisheetmusic/HelpActivity.class
	bin/classes/com/midisheetmusic/LevelArrayAdapter.class
	bin/classes/com/midisheetmusic/NotesExperimentActivity.class
	bin/classes/com/midisheetmusic/PlayAroundActivity.class
	bin/classes/com/midisheetmusic/R$drawable.class
	bin/classes/com/midisheetmusic/R$id.class
	bin/classes/com/midisheetmusic/R$integer.class
	bin/classes/com/midisheetmusic/R$layout.class
	bin/classes/com/midisheetmusic/R$menu.class
	bin/classes/com/midisheetmusic/R$raw.class
	bin/classes/com/midisheetmusic/R$string.class
	bin/classes/com/midisheetmusic/R$style.class
	bin/classes/com/midisheetmusic/R$styleable.class
	bin/classes/com/midisheetmusic/SoonToBe.class
	bin/classes/com/midisheetmusic/TutorialMSActivity.class
	bin/classes/com/midisheetmusic/recordListActivity.class
	bin/classes/com/testmusic/MySimpleArrayAdapter.class
	bin/resources.ap_
	gen/com/actionbarsherlock/R.java
	gen/com/midisheetmusic/R.java
finished work with fabian on crud
finished shared preferences and saving everything