Please work
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into unitTestBranch

Conflicts:
	ChooseYourAdventureTest/src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/test/TestViewPageActivity.java
Merge pull request #155 from KarlParkinson/unitTestBranch

Unit test branch