fix it fix it
Merge branch 'dev' of https://github.com/poppypoppop/Magicians-Artifice into dev