User Controller Tests, all passing
added simplecov setup
Merge pull request #19 from bobolinks-2014/user-controller-tests

User controller tests
Updated add friend button, pseudo-coded functionality
Merge pull request #20 from bobolinks-2014/group-sq-refactor

updated group ans squaring algo with working tests
removed duplicate user_spec file
Merge branch 'master' of https://github.com/bobolinks-2014/mano-a-many
updated routes and removed references to squares
updated routing, added group edit view
Commented out pseudo-code
Merge pull request #21 from bobolinks-2014/routing

Routing
Added group tests
Merge pull request #22 from bobolinks-2014/group_tests

Added group tests
fixed merge conflicts