Josh forgot to commit again
Merge branch 'master' of
https://github.com/RealStandardStudios/PathfinderData.git

Conflicts:
	src/pathfinder/data/Character/Character.java