coupon
no message
Merge branches 'master' and 'master' of https://github.com/MJie46/Eating2.0

Conflicts:
	.DS_Store
coupon
Merge branch 'master' of https://github.com/MJie46/Eating2.0

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.