MainUI 수정.
merged
asdfasdf
Merge remote-tracking branch 'origin/origin' into origin

Conflicts:
	.gitignore
	Trombone/.classpath
	Trombone/bin/Trombone.apk
	Trombone/bin/classes.dex
	Trombone/bin/classes/com/example/trombone/DisplayActivity$1.class
	Trombone/bin/classes/com/example/trombone/DisplayActivity$CheckForLongPress.class
	Trombone/bin/classes/com/example/trombone/DisplayActivity$MusicSheet.class
	Trombone/bin/classes/com/example/trombone/DisplayActivity$RecordAudio.class
	Trombone/bin/classes/com/example/trombone/DisplayActivity.class
	Trombone/bin/classes/com/example/trombone/MainUIActivity.class
	Trombone/bin/classes/com/example/trombone/R$id.class
	Trombone/bin/classes/com/example/trombone/R$layout.class
	Trombone/bin/classes/com/example/trombone/R$menu.class
	Trombone/bin/classes/com/example/trombone/R$string.class
	Trombone/bin/classes/com/example/trombone/R$style.class
	Trombone/bin/classes/com/example/trombone/R$styleable.class
	Trombone/bin/resources.ap_
	Trombone/gen/com/example/trombone/R.java