Merge branch 'release/Version_1.0'
Merge branch 'release/1.1'
Merge branch 'release/Version_1.2'
Merge branch 'master' of https://github.com/tpott/butter-star
Merge branch 'master' of https://github.com/tpott/butter-star into feature/minus
Merge branch 'develop' of https://github.com/tpott/butter-star into feature/minus
billboard hcritter hp
fix merge
got hp to show
Merge branch 'develop' of https://github.com/tpott/butter-star into feature/minus
Merge pull request #62 from tpott/feature/minus

Feature/minus