Working towards a working parcelable but stuck at a StackOverFlowError
Merge pull request #92 from jcadek/master

Implemented Story Tree Mode
Adding data transmission to Activities
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	AndroidManifest.xml
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Page.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Story.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java