Adding back unmergable files; Teach me how to merge!
Merge pull request #33 from SlaterByte/master

Adding back unmergable files; Teach me how to merge!