[Insert your commit message here. Be sure to make it descriptive.]
Merge branch 'master' of https://github.com/CMPUT301F14T04/Funtime-Runtime-Project