Merge pull request #5 from NateMcD/master

Gun and DST's
Merge pull request #7 from xenonsin/master

Merge pull request #5 from NateMcD/master