Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
#87 - Disabled strict thread mode policy for http requests through ESHandler
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
Merge pull request #97 from jcadek/master

Addeddata transmission and fixes/error-catching into ViewStories and EditStory
#82 Added JavaDoc comments to bottom half of classes
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into 82-JavaDoc

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java
Merge pull request #102 from klindenbach/82-JavaDoc

#82 Added JavaDoc comments to bottom half of classes
Merge pull request #101 from tbendubois/94-ESTestHandler

94 - Created a test handler for ES
Merge pull request #99 from tbendubois/83-JUnitTests

83 - Added complete JUnit testing(for now)
t message for your changes. Lines starting