Git is acting up, hopefully this solves it
Merge branch 'master' of github.com:iamhj/heroes