added storyboard images
removed unneeded images.
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Merge pull request #86 from moorej12/master

User can view a page upon selecting a story.
Working towards a working parcelable but stuck at a StackOverFlowError
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Merge pull request #90 from moorej12/master

switched to dia for uml
Merge pull request #91 from moorej12/master

Switched to storing info in Application
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
dds story tree and fixes bugs
Merge pull request #92 from jcadek/master

Implemented Story Tree Mode
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
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
#87 - Disabled strict thread mode policy for http requests through ESHandler
Removed StrictMode as it is moved to HTTPGET
Merge pull request #98 from tbendubois/87-fixgetallstories

87 - Disabled strict thread mode policy for http requests through ESHandler
83 - Added complete JUnit testing(for now)
94 - Created a test handler for ES