test
Merge branch 'master' of https://github.com/icechen1/quickserve

Conflicts:
	app/generate_token.php
	app/www/templates/restaurant_menu.php

bad
Fix syntax error
Merge branch 'master' of https://github.com/icechen1/quickserve