Merge pull request #2 from sumpfork/master

Bring up to date with sumpfork's version
This commit is contained in:
Wendel Voigt 2015-10-20 08:23:33 -05:00
commit 45b0837b55

File diff suppressed because it is too large Load Diff