Merge pull request #15 from phowland1/peter-dev

Peter dev
Merge pull request #19 from phowland1/peter-dev

Peter dev
Merge pull request #20 from phowland1/peter-dev

upgraded to jackson 1.9
Merge pull request #23 from phowland1/peter-dev

user is now prompted to select a number of skill proficiencies equal to ...
Equipment models now included in the db schema