Merge branches 'jamesPull' and 'master'
Merge https://github.com/jcadek/301project into jamesPull
#114 Made ViewPageActivity MVC
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into makeMVC

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ControllerApp.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Page.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/TextTile.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewPageActivity.java
Merge pull request #126 from moorej12/master

#114 Made ViewPageActivity MVC