Brandon fixed it git add --a
Merge branch 'master' of https://github.com/CMPUT301F14T04/Funtime-Runtime-Project