change order of execution in controllers
merge conflict rez
modal figuring out stuff
found modal-backdrop bug
fix modal not closing bug
Merge pull request #23 from allisonlarson/sub_modal

Sub modal