CMPUT301F14T17/Team17Project — pull request #203 by coreyjamison (2014-12-01 14:05:19+00:00)
Title: Fixed stuff that got messed up in merging

Fixed some things that didn't merge right