itty bitty bug fix
Merge branch 'ObjectAndControllerClasses' of https://github.com/Team-CMPUT301F13T12/301-Project into ObjectAndControllerClasses
fixed some errors