Added some comments, slightly improved the team edit page, added link to it in team/show if you are on the team you are looking at
fixed conflicts
Merge pull request #49 from capms/curley

Curley