added lifes
Merge branch 'master' of https://github.com/kothead/rolling

Conflicts:
	src/com/codepenguins/rolling/io/Render.java
	src/com/codepenguins/rolling/model/Player.java
Hearts remain on screen