Merge pull request #6 from barrypevans/master

Merge pull request #1 from DNDJava/master
Merge pull request #7 from barrypevans/master

custom weapons added
Merge pull request #2 from DNDJava/master

back down