Merge branch 'master' into dev_ricky
fix issue where restaurant list isn't loading correctly
Merge branch 'master' of github.com:ordrin/deliveratorjs into dev_ricky
Merge pull request #6 from ordrin/dev_ricky

Dev ricky