j
Merge branch 'master' of https://github.com/usmanshahid/FoodStall-UI

Conflicts:
	css/user.css
	customer-home.html
	js/user.js
	user.html