banana 추가
Merge branch 'master' of https://github.com/cmh1208/assignment2.git

Conflicts:
	src/com/example/Assignment_Layout/MainActivity.java