load data
Merge branch 'master' of https://github.com/ecse428/coupon-client

Conflicts:
	main.js
resolve conflict