test
Merge branch 'khh'

Conflicts:
	gen/kr/ac/mju/capstone/tripshow/R.java
Merge branch 'master' of https://github.com/Kimhyunsoo/TripShow.git

Conflicts:
	bin/TripShow.apk
	bin/classes.dex
	bin/classes/kr/ac/mju/capstone/tripshow/main/IntroActivity$1.class
	bin/resources.ap_
	gen/kr/ac/mju/capstone/tripshow/R.java
	res/layout/tabs_lyaout.xml