a
Merge branch 'master' of https://github.com/Kimhyunsoo/TripShow.git

Conflicts:
	bin/classes/kr/ac/mju/capstone/tripshow/MainActivity.class
Merge branch 'master' of https://github.com/Kimhyunsoo/TripShow.git