start of lives
Merge branch 'master' of github.com:chrishoage/bump

* 'master' of github.com:chrishoage/bump:
  It's a real lake!
cooldown bar
merged life changes