test
Merge branch 'master' of https://github.com/xezw211/van_laravel

Conflicts:
	app/controllers/HomeController.php
	app/routes.php