merge with tonics
Merge branch 'master' of https://github.com/sd-demon/herofactory