Goddamn magicmagicstaves
Merge branch 'master' of
https://github.com/RealStandardStudios/PathfinderDataEditor.git

Conflicts:
	src/view/partials/ItemsController.java
Merge branch 'master' of https://github.com/RealStandardStudios/PathfinderDataEditor.git
changed like one thing on races
Merge branch 'master' of
https://github.com/RealStandardStudios/PathfinderDataEditor.git

Conflicts:
	src/view/partials/ItemsController.java