Merge branch 'master' of https://github.com/Erkky99/Julspel.git

Conflicts:
	src/main/java/eu/tankernn/julklapp/Julspel.java

src/main/java/eu/tankernn/julklapp/Julspel.java

@@ -2,6 +2,7 @@ package eu.tankernn.julklapp;
 import java.awt.EventQueue;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.ArrayList;
 
 import javax.swing.JFrame;
 
@@ -10,11 +11,16 @@ public class Julspel {
 	private JFrame frame;
 	private Map<String, String> associations = new HashMap<>();
 	private int difficulty;
+	
+	private ArrayList<String> name = new ArrayList<String>();
 
 	/**
 	 * Launch the application.
 	 */
 	public static void main(String[] args) {
+		
+
+		
 		EventQueue.invokeLater(new Runnable() {
 			public void run() {
 				try {
@@ -32,6 +38,10 @@ public class Julspel {
 	 */
 	public Julspel() {
 		initialize();
+		
+		name.add("Claes");
+		name.add("Lars");
+		name.add("");
 	}
 
 	/**