Revert "Merge branch 'master' of https://github.com/jaypoulz/Galamax"

This reverts commit 077d182702d301c7a5a4e6c8294f6c4c98f37b8b, reversing
changes made to f9a1266f06be4d432ba657ce4f1ee842049195bd.