조표 added
to merge
Merge remote-tracking branch 'origin/origin' into origin

Conflicts:
	Trombone/src/com/example/trombone/DisplayActivity.java