Jash did things, including stuff.
Did a things hopfully merged?
Merged?j
This time maybe?
Y U NO THINGS
FIX!
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/view/partials/FeatsPartial.fxml
	src/view/partials/ItemsController.java
	src/view/partials/RacesPartial.fxml
	src/view/partials/itemPartials/BasicGoodsPartial.fxml