Merge remote-tracking branch 'origin/master'

src/engine/input/GamepadInput.java

@@ -107,8 +107,8 @@ public class GamepadInput {
         return new Vector3f(x,y);
     }
 
-    public int getGamepadName(){
-        return  this.gamepadNum;
+    public String getGamepadName(){
+        return glfwGetGamepadName(this.gamepadNum);
     }
 	
 }