in the middle of checking cancel/delete buttons on signups, but need to pull
fixed merge conflicts
fixed merge conflicts again?
Merge branch 'master' of https://github.com/ddgriffin/GG-mvp