last stuff
Merge branch 'master' of https://github.com/wilchandler/exitslips
fixed merge