First pass
Merge branch 'master' of github.com:KaminariNoKage/MadLib