new commit
new commit
Merge branch 'master' of https://github.com/neilpadura/Asteroid.git
hp bar, score bar, exit when hp<=0
hp bar, score bar, exit when hp<=0
hp bar, score bar, exit when hp<=0,movements
hp bar, score bar, exit when hp<=0,movements
Merge origin/master

Conflicts:
	.gitignore
	src/com/finalproject/asteroid/Asteroid.java
Merge origin/master

Conflicts:
	.gitignore
	src/com/finalproject/asteroid/Asteroid.java
Merge origin/master

Conflicts:
	.gitignore
	src/com/finalproject/asteroid/Asteroid.java