changing some stuff
Merge pull request #13 from CMPUT301F13T04/hassaan1

changing some stuff