Merge pull request #239 from CMPUT301F14T03/noMockServer

No mock server
Merging with upstream

Merge remote-tracking branch 'upstream/master' into noMockServer
Merging with upstream