fixed edit page issue
fixed conflicts
approval work
fixed conflicts
Added button functionality for publication for the first file of teams.
s

notsurewhythisishappenin  quit
done
finished the button stuff for publishing. Fixed resume modal.
Merge pull request #42 from capms/curley

Curley