I actually didn't do that at all, I just broke everything. This should fix it.
Merge branch 'master' of https://github.com/CMPUT301F14T04/Funtime-Runtime-Project