fixing redefine warnings
Merge branch 'master' of github.com:robmccoll/stinger