Moved the things from the place to the other place with the things.
Merge branch 'master' of https://github.com/CMPUT301F14T04/Funtime-Runtime-Project