Fixed conflict
Merge branch 'master' of https://github.com/CMPUT301F14T04/Funtime-Runtime-Project
Fixed conflict