Merge remote-tracking branch 'arcade-controls/develop' into feature/controls

Conflicts:
	README.md
	control/GameControl.java
	main/Main.java
	main/Window.java
	model/GameModel.java
	view/GameView.java

view/GameView.java

@@ -1,5 +1,6 @@
 package view;
 
+import java.awt.Color;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.event.ActionEvent;
@@ -9,6 +10,7 @@ import javax.swing.JPanel;
 import javax.swing.Timer;
 
 import model.Player;
+import control.LedHandler;
 
 public class GameView extends JPanel implements ActionListener{
 	
@@ -18,9 +20,11 @@ public class GameView extends JPanel implements ActionListener{
 	private static final long serialVersionUID = 1939480784205689618L;
 	Timer t;
 	Player player;
+	LedHandler led;
 	
-	public GameView()
+	public GameView(LedHandler led)
 	{
+		this.led=led;
 		t = new Timer(1000/30, this);
 		t.start();
 	}
@@ -29,6 +33,7 @@ public class GameView extends JPanel implements ActionListener{
 		repaint();
 	}
 	
+	@Override
 	public void paintComponent(Graphics g)
 	{
 		super.paintComponent(g);