json with ajax
Merge remote-tracking branch 'origin/master'

Conflicts:
	HotDog-master/GroupOn/index.html
	HotDog-master/GroupOn/new_detail.html