File upload display
Merge branch 'master' into profilepage

adding upload functionality
File upload display
Merge pull request #43 from capms/profilepage

Changes to teams page