Revert "Master"

Reverts jpanda109/ShiftGameBeta#1