asdlfkjasldfjalj
Yay
whoohoo
Merge branch 'master' of https://github.com/choucalate/TnC

Conflicts:
	.classpath
	bin/MidiSheetMusic.apk
	bin/classes.dex
	bin/classes/com/midisheetmusic/Piano$1.class
	bin/classes/com/midisheetmusic/Piano.class
	bin/classes/com/midisheetmusic/TutorialMSActivity.class
	bin/dexedLibs/android-support-v4-418a0dd16d19c495406fdd5551843ce4.jar
	bin/dexedLibs/android-support-v4-77eecf0c735dea889c64bbd4c79c9ade.jar
	bin/dexedLibs/android-support-v4-e133c49e1f9fb23a65eae74aeb0bcd84.jar
	bin/resources.ap_
	src/com/midisheetmusic/Piano.java
	src/com/midisheetmusic/TutorialMSActivity.java
Here are the new files- either the noteplay object or some other
encoding
Added noteplay
Merge branch 'master' of https://github.com/choucalate/TnC

Conflicts:
	bin/MidiSheetMusic.apk
	bin/classes.dex
	bin/classes/com/midisheetmusic/TutorialMSActivity.class
	bin/resources.ap_