changed header
commiting more stuff from chris I am scared about
fixed merge conflicts with modal popup
Merge branch 'christine-tuesday7'

Merging master, post conflict resolution for the modal popups with crud functionality.