On branch master
	new file:   json/level/level1.json
	new file:   json/level/level2.json
	new file:   json/movable/enemy/enemy.txt
	new file:   json/movable/enemy/testenemy1.json
	new file:   json/movable/enemy/testenemy2.json
	new file:   json/movable/enemy/testenemy3.json
	new file:   json/weapon/canon.json
	new file:   json/weapon/laser.json
	modified:   src/Client.java
	modified:   src/entities/HUD.java
	new file:   src/factory/EnemyFactory.java
	new file:   src/factory/LevelSet.java
new file:   src/factory/Spawner.java
	new file:   src/test/TestClient.java
	new file:   src/test/TestKlasse.java
Merge branch 'master' of git://github.com/Quaitgor/space_shooter
 On branch master
	modified:   json/level/level2.json
	new file:   src/entities_decor/Asteroid.java
	new file:   src/entities_decor/AstroidBelt.java
	new file:   src/entities_decor/BarrierHit.java
	new file:   src/entities_decor/Electro.java
	new file:   src/entities_decor/ForceField.java
	new file:   src/entities_decor/ForceFieldPart.java
	new file:   src/entities_decor/Hit.java
	new file:   src/entities_decor/Moon.java
	new file:   src/entities_decor/Stars.java
	modified:   src/factory/EnemyFactory.java
	modified:   src/factory/FactoryEnemy.java
	modified:   src/factory/Spawner.java
	modified:   src/movementV2/Straight.java
	deleted:    src/entites/decor/Asteroid.java
	deleted:    src/entites/decor/AstroidBelt.java
	deleted:    src/entites/decor/BarrierHit.java
	deleted:    src/entites/decor/Electro.java
	deleted:    src/entites/decor/ForceField.java
	deleted:    src/entites/decor/ForceFieldPart.java
	deleted:    src/entites/decor/Hit.java
	deleted:    src/entites/decor/Moon.java
	deleted:    src/entites/decor/Stars.java