Revert "Corrected Merge Conflicts in branch defaulting to Production"

This reverts commit 4395639ad83a506995f9dd6b3ac99f2c4cd936fa.
Fixed merge conflicts -- for real this time!

Also added an empty method to MockWorld, since we added a new required
method to the World class.