added cohorts and locations
dasf
Merge pull request #10 from otters-2014/team_greg_greg

Adds actions to UserController and simplecov gem