On branch master
	new file:   src/Launcher/Launcher.java
	modified:   src/behaviours/Boss.java
	modified:   src/behaviours/Suicidal.java
	modified:   src/ent_c/Player.java
	new file:   src/ent_c/Rocket.java
	modified:   src/entites_decor/Asteroid.java
	modified:   src/entites_decor/AstroidBelt.java
	modified:   src/entities/Entity.java
	modified:   src/entities/HUD.java
	modified:   src/entities/HasMind.java
	modified:   src/entities/Mindless.java
	modified:   src/entities/Moveable.java
	modified:   src/entities/MoveableDecor.java
	modified:   src/entities/Offensive.java
	modified:   src/entities/StaticDecor.java
	modified:   src/factory/EnemyFactory.java
	modified:   src/factory/LevelSet.java
	modified:   src/factory/Spawner.java
	deleted:    src/Launcher/Client.java
	deleted:    src/ent_c/EnemyDummyWithMind.java
	deleted:    src/movementV2/StraightTrigRotate.java
Merge branch 'master' of https://github.com/Quaitgor/space_shooter

Conflicts:
	src/behaviours/Boss.java
	src/behaviours/Suicidal.java
	src/ent_c/Player.java
	src/entites_decor/Asteroid.java
	src/entites_decor/AstroidBelt.java
	src/entities/Offensive.java

 On branch master
	modified:   json/level/philippboss.json
	modified:   json/level/test.json
	deleted:    res/sprites/1spriteship.png
	deleted:    res/sprites/barrierHit.png
	deleted:    res/sprites/boss2.png
	deleted:    res/sprites/electro.png
	deleted:    res/sprites/explosion.png
	new file:   res/sprites/explosion/defaultexplosion.png
	renamed:    res/sprites/projectile/smallice.png -> res/sprites/explosion/smalliceexplosion.png
	deleted:    res/sprites/field.png
	deleted:    res/sprites/hit.png
	new file:   res/sprites/hitbox/powerup.PNG
	new file:   res/sprites/hitbox/projectile/chargelvl1.png
	new file:   res/sprites/hitbox/projectile/chargelvl2.png
	new file:   res/sprites/hitbox/projectile/chargelvl3.png
	new file:   res/sprites/hitbox/projectile/fire.png
	new file:   res/sprites/hitbox/projectile/ice.png
	new file:   res/sprites/hitbox/projectile/plasma.png
	new file:   res/sprites/hitbox/projectile/projectilefireCharge.png
	new file:   res/sprites/hitbox/projectile/projectilefirePlasma.png
	deleted:    res/sprites/iceexplosion.png
	deleted:    res/sprites/plasmaexplosion.png
	deleted:    res/sprites/playerbulps.png
	deleted:    res/sprites/playerlight.png
	new file:   res/sprites/powerup.PNG
	deleted:    res/sprites/projectile/TEST/17112_1151116415.png
	deleted:    res/sprites/projectile/TEST/29360_1259720821.png
	deleted:    res/sprites/projectile/TEST/fire.xcf
	deleted:    res/sprites/projectile/TEST/ice.xcf
	deleted:    res/sprites/projectile/TEST/plasma1.png
	deleted:    res/sprites/projectile/default.png
	deleted:    res/sprites/projectile/glow.png
	deleted:    res/sprites/projectile/ice.xcf
	deleted:    res/sprites/projectile/plasma.xcf
	modified:   res/sprites/projectile/smallice.png
	deleted:    res/sprites/smalliceexplosion.png
	deleted:    res/sprites/stars - Kopie.png
	modified:   src/behaviours/Suicidal.java
	modified:   src/ent_c/Boss1.java
	modified:   src/ent_c/Enemy1.java
	modified:   src/ent_c/Enemy2.java
	modified:   src/ent_c/Enemy3.java
	modified:   src/ent_c/EnemyDummy.java
	modified:   src/ent_c/EnemyDummyWithMind.java
	modified:   src/ent_c/PhilippBoss.java
	modified:   src/ent_c/Player.java
	new file:   src/ent_c/Powerup.java
	modified:   src/ent_c/Rocket.java
	deleted:    src/entites_decor/BarrierHit.java
	deleted:    src/entites_decor/Electro.java
	deleted:    src/entites_decor/ExplodeVar.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/SmallIceExplode.java
	deleted:    src/entites_decor/Stars.java
	modified:   src/entities/Collision.java
	modified:   src/entities/Moveable.java
	modified:   src/entities/Offensive.java
	modified:   src/entities_decor/Asteroid.java
	deleted:    src/entities_decor/BarrierHit.java
	deleted:    src/entities_decor/Electro.java
	deleted:    src/entities_decor/ForceField.java
	deleted:    src/entities_decor/ForceFieldPart.java
	deleted:    src/entities_decor/Hit.java
	modified:   src/entities_decor/SmallIceExplode.java
	deleted:    src/factory/FactoryEnemy.java
	modified:   src/graphics/GS.java
	modified:   src/graphics/LayerData2.java
	modified:   src/movementV2/PlayerMove.java
	new file:   src/projectiles/BossProjectile.java
	modified:   src/projectiles/Chargelvl1Projectile.java
	modified:   src/projectiles/Chargelvl2Projectile.java
	modified:   src/projectiles/Chargelvl3Projectile.java
	modified:   src/projectiles/DefaultProjectile.java
	modified:   src/projectiles/Fire.java
	modified:   src/projectiles/FireProjectile.java
	modified:   src/projectiles/IceProjectile.java
	modified:   src/projectiles/IceProjectileSmall.java
	modified:   src/projectiles/PlasmaProjectile.java
	new file:   src/weapons/BossWeapon.java
	modified:   src/weapons/ChargeWeapon.java
	modified:   src/weapons/DefaultWeapon.java
	deleted:    src/weapons/FireWeapon.java
	renamed:    src/weapons/Inferno.java -> src/weapons/InfernoWeapon.java
	modified:   src/weapons/PlasmaWeapon.java
	deleted:    src/Launcher/Client.java
	deleted:    src/movementV2/StraightTrigRotate.java