Create laravel project
Merge branch 'master' of https://github.com/azraaibaharin/marmar

Conflicts:
	app/config/app.php