sdfaf
Merge branch 'master' of https://github.com/jcancino/bahamaslistings

Conflicts:
	app/views/errors/404.blade.php