deleted redundant stuff
Merge https://github.com/CMPUT-301F14T10/project
Changed the versions of all classes to version 1.0