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