fixed inventory, still kinda clunky
Merge branch 'master' of
https://github.com/RealStandardStudios/RpgApp.git

Conflicts:
	src/view/partials/dialogs/NewCharacterController.java
	src/view/partials/dialogs/partials/EquipmentPartialController.java
Merge branch 'master' of
https://github.com/RealStandardStudios/RpgApp.git

Conflicts:
	src/view/InventoryPartialController.java
	src/view/RootController.java
	src/view/partials/dialogs/NewCharacterController.java