Final V2
the jar, I guess
the jar, I guess
Merge branch 'nextGeneration' of https://github.com/DonFusili/Astroids.git into nextGeneration
class files???
Merge branch 'nextGeneration' into nextGenerationJoost

Jipiiii

Conflicts:
	bin/ship/Bullet.class
	bin/space/Asteroid.class
	bin/tests/ShipTest.class
	bin/tests/WorldTest.class
	src/ship/Bullet.java
	src/tests/GeneralTests.java
	src/tests/WorldTest.java