Committer: philippsauter
 On branch master
	new file:   json/enemies/standard-enemy.json
	modified:   json/level/level1.json
	modified:   json/level/level2.json
	modified:   json/movable/enemy/enemy.txt
	modified:   json/movable/enemy/testenemy1.json
	modified:   json/movable/enemy/testenemy2.json
	modified:   json/movable/enemy/testenemy3.json
	modified:   json/weapon/canon.json
	modified:   json/weapon/laser.json
	modified:   src/ent_c/Enemy1.java
	modified:   src/ent_c/EnemyDummy.java
	modified:   src/ent_c/Player.java
	modified:   src/entities/Collision.java
	modified:   src/entities/Moveable.java
	modified:   src/entities/Offensive.java
	modified:   src/graphics/GS.java
	modified:   src/movementV2/PlayerMove.java
	new file:   src/movementV2/StraightTrigonometry.java
	new file:   src/movementV2/TargetPosition.java