Merge branch 'master' into grace
laravel
Merge branch 'grace'
Merge branch 'master' of https://github.com/gpai/restaurantzz

Conflicts:
	test/test.html