wrote acceptance test for adding a project
created acceptance test for viewing projects
specs for admin creating, viewing, editing, and deleting cohort
added students and group content to cohort show page spec
added cohort id to edit_cohort_path
added user story info and edited per Erics suggestions
created additional acceptanc tests for projects
added delete and edit user stories
merged conflicts
added spec for viewing cohort show page and merged models
controller created
tests are green without authentication and signin functionality commented out
new factories created and testing for admin vs student rights
incorporated Erics edits
Merge pull request #3 from TechnoAlchemist/cohort

specs for admin creating, viewing, editing, and deleting cohort
Merge branch 'master' into add_project_test

Conflicts:
	spec/support/factories.rb
OmniAuth seems to work but the test is failing
only four failing tests remainj
Tests passing for OmniAuth
three failing tests left