fixed edit page issue
fixed conflicts
approval work
fixed conflicts
Merge pull request #41 from capms/message_board

Message board
merging
Added button functionality for publication for the first file of teams.
s

notsurewhythisishappenin  quit
done
finished the button stuff for publishing. Fixed resume modal.
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
Merge remote-tracking branch 'origin' into message_board
front end