merge conflicts yo
added ability to add groups, looks horrible though
Merge pull request #10 from heruku/users_show

Users show