Merge pull request #40 from murphyslaw480/master

New weapons and stat effects