ff0dafcee017a103f01aa8dfb57de3bf97745e04
Conflicts: README.md control/GameControl.java main/Main.java main/Window.java model/GameModel.java view/GameView.java
branch for the buttons and joystick for gpio raspberry
Conflicts: README.md control/GameControl.java main/Main.java main/Window.java model/GameModel.java view/GameView.java
branch for the buttons and joystick for gpio raspberry