Working towards a working parcelable but stuck at a StackOverFlowError
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
Removed StrictMode as it is moved to HTTPGET
Merge pull request #97 from jcadek/master

Addeddata transmission and fixes/error-catching into ViewStories and EditStory
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into 82-JavaDoc

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java