fixed  https://github.com/CMPUT404F16Project/cmput404-project/issues/15
fixed  https://github.com/CMPUT404F16Project/cmput404-project/issues/15

CMPUT404F16Project/cmput404-project,CMPUT404F16Project/cmput404-project,CMPUT404F16Project/cmput404-project,CMPUT404F16Project/cmput404-project