herp

++
Merge branch 'master' of https://github.com/tpedrob/BookOfHeroes