new
Merge branch 'master' of https://github.com/usmanshahid/FoodStall

Conflicts:
	application/views/common/header.php
Merge branch 'master' of https://github.com/usmanshahid/FoodStall

Conflicts:
	application/views/common/header.php