Revert "Merge branch 'master' of https://github.com/BeFreeCODE/RescuePrincess"

This reverts commit ff3bfaa1bde3407c368b7dffa1ab65fa0d88e4eb, reversing
changes made to d488efe88fbbd47bbecc099072185aa20b418975.