On branch master
Merge branch 'master' of https://github.com/Quaitgor/space_shooter

Conflicts:
	src/projectiles/FireProjectile.java

 On branch master
	modified:   json/keyconfiguration.json
	modified:   json/level/level2.json
	modified:   src/entities/Collision.java
	new file:   src/entities/Powerup.java
	modified:   src/entities_decor/AstroidBelt.java
	modified:   src/graphics/GS.java
	modified:   src/movementV2/InfiniteScroll.java
	new file:   src/powerups/DefaultPower.java
	new file:   src/powerups/IcePower.java
	new file:   src/powerups/InfernoPower.java
	new file:   src/powerups/PlasmaPower.java
	modified:   src/projectiles/FireProjectile.java
	modified:   json/level/level2.json
	deleted:    src/ent_c/Powerup.java
Merge branch 'master' of https://github.com/Quaitgor/space_shooter
Erste Tests
 On branch master
	modified:   json/level/level2.json
	modified:   json/level/philippboss.json
	new file:   res/sprites/hitbox/powerup.png
	new file:   res/sprites/powerup.png
	new file:   src/behaviours/Random6PositionBoss.java
	modified:   src/ent_c/Enemy3.java
	modified:   src/ent_c/PhilippBoss.java
	modified:   src/entities/Collision.java
	modified:   src/entities/Moveable.java
	new file:   src/factory/Spawn.java
	modified:   src/factory/Spawner.java
	modified:   src/graphics/GS.java
	modified:   src/movementV2/TargetPosition.java
	modified:   src/test/CollisionTest.java
	new file:   src/test/EnemyFactoryTest.java
	deleted:    res/sprites/hitbox/powerup.PNG
	deleted:    res/sprites/powerup.PNG
	deleted:    src/factory/LevelSet.java