Merge branch 'master' of https://github.com/mattferrin/herolump
Merge branch 'master' of https://github.com/mattferrin/herolump