Merge branch 'master' of feistymeow.org:feisty_meow into development
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 01:01:12 +0000 (20:01 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 01:01:12 +0000 (20:01 -0500)
still working out the kinks


Trivial merge