Revert 664a01d..b182316

This rolls back to commit 664a01d6b89bf0b00952f0a4ca2dbe6fb222b0b2.
Revert "Revert 664a01d..b182316"

This reverts commit 60fb05aa26ee721da418961c8e709c85dec1d481.
Merge branch 'master' of https://github.com/ztrewq/PacManML