I added raceStats JSON to link races with their stat adjustments.
Update README.md
Update README.md
Merge branch 'master' of https://github.com/pieAre5quare/rpg
Merge https://github.com/stoci/rpg into dev
Merge branch 'master' into dev
I added current stat variables, created addBaseStatBonus method in Model.java. Changed state 9 to display current stats. The addBaseStatBonus method only does bonus for race, still needs to incorporate the rest.
I changed the form of adding bonuses to the base stats so they are more readable. It now adds bonus for race, gender, profession, and alignment. Needs to add age bonus.
I added the bonus for age. Runs into problems on extrema (i.e. < 24 or >= 88).
I added the bonus for age. Runs into problems on extrema (i.e. < 24 or >= 88).
I moved the methods that handle adding modifiers to CharCreationFSM. Also removed raceStats.json.
I changed the design of Model to be more robust by creating an internal state for the object. Also changed the name of the bonus in the JSON files from Mystic to Magic Points.
Changed the order of private methods.
overrode toString method in BonusWrapper, fixed typos in Model and other
places, added debug for loop in MainFSM
Merge branch 'dev' of https://github.com/pieAre5quare/rpg into pieAre5quare-dev

Conflicts:
	src/character/Model.java
	src/main/CharCreationFSM.java
Merge branch 'pieAre5quare-dev' into dev
removed bad code, simplified bonus application, added comments, renamed
JsonParser class to JSONReader