land
Merge branch 'master' of https://github.com/davin-bao/lands

Conflicts:
	app/routes.php
	composer.lock