Merge branch 'develop' of https://github.com/ProjectGroepA2/Arcade into develop

Conflicts:
	main/Window.java
	model/drawObjects/Player.java
	model/gameState/PlayState.java

model/drawObjects/DrawObject.java

@@ -21,6 +21,10 @@ public abstract class DrawObject {
 		this.index = index;
 	}
 	
+	public void setIndex(int index){
+		this.index = index;
+	}
+	
 	public abstract void draw(Graphics2D g2);
 	public abstract void update();
 }