item de vida implementado
Merge origin/master

Conflicts:
	src/spaceship/dados/Bullet.java
	src/spaceship/dados/BulletItem.java
	src/spaceship/dados/Collider.java
	src/spaceship/dados/Enemy.java
	src/spaceship/dados/Level.java
	src/spaceship/dados/LifeItem.java
	src/spaceship/dados/PlayerShip.java
	src/spaceship/dados/Stone.java
Merge origin/master

Conflicts:
	src/spaceship/dados/Bullet.java
	src/spaceship/dados/BulletItem.java
	src/spaceship/dados/Collider.java
	src/spaceship/dados/Enemy.java
	src/spaceship/dados/Level.java
	src/spaceship/dados/LifeItem.java
	src/spaceship/dados/PlayerShip.java
	src/spaceship/dados/Stone.java