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

Conflicts:
	src/kr/ac/mju/capstone/tripshow/MainActivity.java