Merge origin/master

Conflicts:
	src/pathfinder/gui/combatStats.fxml
	src/rpg/gui/GUI.java
	src/rpg/gui/MainController.java
	src/rpg/gui/main.fxml
Merge origin/master
did some thing