no message
Merge branch 'develop' of github.com:seek-city/seek-city into phil

Conflicts:
	app/config/app.php
venues seeder and commenting out other seeders.
merge fix
Merge branch 'develop' of github.com:seek-city/seek-city into phil
new activities seeder.
Merge pull request #39 from seek-city/phil

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

Conflicts:
	app/database/seeds/ActivitiesTableSeeder.php
	composer.json
Merge pull request #40 from seek-city/ruth-map

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

Conflicts:
	app/database/seeds/ActivitiesTableSeeder.php
	app/views/activities/index.blade.php
	composer.json