trying to just commit one file
praying this works
Merge branch 'master' of https://github.com/jcancino/bahamaslistings

Conflicts:
	app/start/global.php
	app/views/errors/404.blade.php
	app/views/layouts/master.blade.php

test