team view page
Fixed merge conflicts
Merge pull request #121 from domestic/viewz

team view page