diff --git a/PokerKata/src/session3/PokerGame.java b/PokerKata/src/session3/PokerGame.java
index a36f2a5..841bad9 100644
--- a/PokerKata/src/session3/PokerGame.java
+++ b/PokerKata/src/session3/PokerGame.java
@@ -1,17 +1,16 @@
+/*
+ * PokerGame.java
+ * 
+ * Course in Software Craftsmenship @ Högskolan Väst
+ * Poker game kata for testing TDD, Test Driven Development
+ * 
+ * 2015-04-27
+ */
+
 package session3;
 
 import java.util.Arrays;
 
-/* SCORES
-<<<<<<< HEAD
- * 2	Pair
- * 3	Three Of A Kind
-=======
- * 1	Pair !
->>>>>>> origin/master
- * 
- * S2K3R5H6S7
- */
 public class PokerGame {
 	public int getScore(String hand) {
 		int score = 0;
diff --git a/PokerKata/test/session3/PokerGameTest.java b/PokerKata/test/session3/PokerGameTest.java
index 6344a4f..3ede53c 100644
--- a/PokerKata/test/session3/PokerGameTest.java
+++ b/PokerKata/test/session3/PokerGameTest.java
@@ -1,3 +1,12 @@
+/*
+ * PokerGame.java
+ * 
+ * Course in Software Craftsmenship @ Högskolan Väst
+ * Poker game kata for testing TDD, Test Driven Development
+ * 
+ * 2015-04-27
+ */
+
 package session3;
 
 import static org.junit.Assert.assertEquals;
@@ -5,20 +14,6 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 
 public class PokerGameTest {
-	// FIXME get_color
-	// FIXME get_value
-	// FIXME draw_one_card
-	// FIXME draw_five_cards
-	// FIXME draw_one_hand
-	// FIXME compare_two_hands
-	// FIXME find_highest_score
-
-	// Spader
-	// Hjärter
-	// Ruter
-	// Klöver
-
-	// K
 	PokerGame myGame = new PokerGame();
 
 	@Test