Merge pull request #32 from wterpstra/master

Updated for 1.7.7+, support for stashes, updated weapons
Create oring.png
Create oring.txt
Delete oring.png
Created oring.png
Update to show Oring Support
Merge pull request #34 from khamseen/master

Adding Oring Support
Merge pull request #1 from zamp/master

Pulled in Oring