added health powerup
so many merge conflicts...
added health
only one conflict, that's new
trying to fix drawing problems
merging
inverted controls