File upload display
Merge branch 'master' into profilepage

adding upload functionality
Merge pull request #42 from capms/curley

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

Changes to teams page
now when user leaves/joins team all bulletins/approvals deleted, a bunch of random/small stuff on front and back end