Basic hp collectables, bug fixes
Merge branch 'master' of github.com:eman41/TopDownBottomUp