CMPUT301F13T02/301project — pull request #144 by KarlParkinson (2013-11-07 21:27:00+00:00)
Title: Fixed conflicts in TestViewPageActivity, and tweaked other tests as well...

These all build for me.