diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..68e168f
Binary files /dev/null and b/.DS_Store differ
diff --git a/prog2-codebase/GameProject/bin/.gitignore b/prog2-codebase/GameProject/bin/.gitignore
new file mode 100644
index 0000000..aa21310
--- /dev/null
+++ b/prog2-codebase/GameProject/bin/.gitignore
@@ -0,0 +1,8 @@
+/base/
+/collider/
+/controller/
+/gameobjects/
+/log4j2.xml
+/playground/
+/rendering/
+/ui/
diff --git a/spaceinvaders/.DS_Store b/spaceinvaders/.DS_Store
new file mode 100644
index 0000000..06d8e87
Binary files /dev/null and b/spaceinvaders/.DS_Store differ
diff --git a/spaceinvaders/GameProject/.DS_Store b/spaceinvaders/GameProject/.DS_Store
new file mode 100644
index 0000000..2209be3
Binary files /dev/null and b/spaceinvaders/GameProject/.DS_Store differ
diff --git a/spaceinvaders/GameProject/bin/.gitignore b/spaceinvaders/GameProject/bin/.gitignore
index 61c497a..aa21310 100644
--- a/spaceinvaders/GameProject/bin/.gitignore
+++ b/spaceinvaders/GameProject/bin/.gitignore
@@ -1 +1,8 @@
+/base/
+/collider/
+/controller/
+/gameobjects/
+/log4j2.xml
 /playground/
+/rendering/
+/ui/
diff --git a/spaceinvaders/GameProject/bin/log4j2.xml b/spaceinvaders/GameProject/bin/log4j2.xml
index f21f70a..63b0589 100644
--- a/spaceinvaders/GameProject/bin/log4j2.xml
+++ b/spaceinvaders/GameProject/bin/log4j2.xml
@@ -20,7 +20,7 @@
 			<appender-ref ref="File" />
 		</root>
 		
-		<Logger name="base.GameLoop" level="info">      		
+		<Logger name="playground.LevelMovingHitObjects" level="trace">      		
     	</Logger>
     	
     	<Logger name="playground" level="info">      		
diff --git a/spaceinvaders/GameProject/lib/.DS_Store b/spaceinvaders/GameProject/lib/.DS_Store
new file mode 100644
index 0000000..777e758
Binary files /dev/null and b/spaceinvaders/GameProject/lib/.DS_Store differ
diff --git a/spaceinvaders/GameProject/src/log4j2.xml b/spaceinvaders/GameProject/src/log4j2.xml
index f21f70a..63b0589 100644
--- a/spaceinvaders/GameProject/src/log4j2.xml
+++ b/spaceinvaders/GameProject/src/log4j2.xml
@@ -20,7 +20,7 @@
 			<appender-ref ref="File" />
 		</root>
 		
-		<Logger name="base.GameLoop" level="info">      		
+		<Logger name="playground.LevelMovingHitObjects" level="trace">      		
     	</Logger>
     	
     	<Logger name="playground" level="info">      		
diff --git a/spaceinvaders/GameProject/src/playground/LevelMovingHitObjects.java b/spaceinvaders/GameProject/src/playground/LevelMovingHitObjects.java
index 0d3b1e4..09c1d01 100644
--- a/spaceinvaders/GameProject/src/playground/LevelMovingHitObjects.java
+++ b/spaceinvaders/GameProject/src/playground/LevelMovingHitObjects.java
@@ -26,7 +26,7 @@ public class LevelMovingHitObjects extends SpaceInvadersLevel {
   @Override
   public void prepareLevel(String id) {
 		super.prepareLevel(id);
-		
+		Logger.trace("Creating and adding two RectObjects with Collider");
 		blueBox  = new RectObject("fly_enemy1", this, 300, 300, 75, 40, 40, 40, Color.BLUE);
 		this.addObject(blueBox);
 		ReboundController boxControl = new ReboundController();
@@ -40,15 +40,18 @@ public class LevelMovingHitObjects extends SpaceInvadersLevel {
 		greenBox.addController(boxControl_2);
 		RectCollider colliderGreen = new RectCollider("ColliderGreen", greenBox, 40, 40);
 		greenBox.addCollider(colliderGreen);
+		Logger.debug("successfully finished prepareLevel with two RectObjects");
   }
   
   @Override
   void actionIfEgoCollidesWithEnemy(GameObject enemy, GameObject ego) {
-	  super.actionIfEgoCollidesWithEnemy(enemy, ego);
 	  if(enemy.id.contains("fly")) {
 	      this.lost = true;
 	      Playground.setGlobalFlag("egoLives", 0);
 	      Logger.info("ego hit a letal RectObject. Game ends NOW");
+	  } else {
+		  Logger.debug("ego hit one of the other aliens, calling parent class code");
+		  super.actionIfEgoCollidesWithEnemy(enemy, ego);
 	      
 	      HighscoreManager.writeHSToFile((Integer) Playground.getGlobalFlag("points"),
 	      (Integer) Playground.getGlobalFlag("highscore"));