[contact_us]
Merge branch 'master' of https://github.com/StephanusJeffry/frunk

Conflicts:
	app/routes.php