커밋
Merge branch 'master' of https://github.com/uoscsAndroid/CouponKING.git

Conflicts:
	src/com/example/CouponKING/Location.java