Fixed Conditional Appearence
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewPageActivity.java
Merge pull request #280 from jcadek/master

Fixed GUI stuff