added popup function
fixed merge conflicts
Merge branch 'master' of https://github.com/wilchandler/exitslips into cr-sect-modal
it works
working popup
Merge branch 'master' of https://github.com/wilchandler/exitslips into cr-sect-modal