oops
created events scaffolding
Merge pull request #3 from seek-city/josh-events-scaffold

created events scaffolding
added actions for event controller
created layout of create page
creating Event model, table migrations, and faker seeder.
created layout of edit page
created layout of index page
created layout of show  page
resolving merge conflict
Merge pull request #4 from seek-city/phil

added actions for event controller
Merge pull request #5 from seek-city/ruth

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

Conflicts:
	app/controllers/EventsController.php
changed EventsController to ActivitiesController.
renaming event to activity. namespace issue.
Merge pull request #6 from seek-city/josh-change-event-to-activity

Josh - change event to activity
one last file to change to activity
Merge pull request #7 from seek-city/josh-change-event-to-activity

one last file to change to activity
yay fixed the transition to activity from event~git add -Agit add -A