Fixed things.
Merge branch 'master' of https://github.com/shinyquagsire23/M_X-RuinsofAlph
Merge branch 'master' of https://github.com/shinyquagsire23/M_X-RuinsofAlph