Added +/- buttons for lives
Merge branch 'Jason'