6808919490a7f14e63c9e41232f706aad194f6ba
Conflicts: main/Window.java model/drawObjects/Player.java model/gameState/PlayState.java
branch for the buttons and joystick for gpio raspberry
Conflicts: main/Window.java model/drawObjects/Player.java model/gameState/PlayState.java
branch for the buttons and joystick for gpio raspberry