modified
merge fix
Merge branch 'develop' of github.com:seek-city/seek-city into ruth-map

Conflicts:
	app/config/app.php
	app/routes.php
	composer.json
modified
modified
updated pricing info
Merge pull request #38 from seek-city/ruth-map

Ruth map
Merge branch 'develop' of github.com:seek-city/seek-city into josh-pie-menu-json
trying to chain queries