added a createList method to BrowseStoriesActivity.java
made StoryAdaptor.java
added isEditable to Story.java
See if you can find what I changed. hint: check the activity_home.xml
committed
Revert "committed"

This reverts commit bcd0e2d1a306f0e525a6e8231270a1c2f4d7a634.
Merge branch 'master' of
https://github.com/CMPUT301F13T14/Team14StoryBuilder

Conflicts:
	Cryosa/res/values/strings.xml
	Cryosa/src/ca/ualberta/cs/cmput301/cryosa/BrowseStoriesActivity.java
Merge branch 'master' of
https://github.com/CMPUT301F13T14/Team14StoryBuilder.git

Conflicts:
	Cryosa/res/menu/browse_stories.xml
	Cryosa/res/menu/create_story.xml
	Cryosa/src/ca/ualberta/cs/cmput301/cryosa/BrowseStoriesActivity.java
	CryosaTest/src/ca/ualberta/cs/cmput301/cryosa/test/IStoryRepositoryTest.java
Merge branch 'master' of
https://github.com/CMPUT301F13T14/Team14StoryBuilder.git

Conflicts:
	Cryosa/AndroidManifest.xml
	Cryosa/res/menu/browse_stories.xml
	Cryosa/res/menu/create_story.xml
	Cryosa/src/ca/ualberta/cs/cmput301/cryosa/BrowseStoriesActivity.java
Merge branch 'master' of
https://github.com/CMPUT301F13T14/Team14StoryBuilder.git

Conflicts:
	Cryosa/src/ca/ualberta/cs/cmput301/cryosa/BrowseStoriesActivity.java
	Cryosa/src/ca/ualberta/cs/cmput301/cryosa/manager/DummyManager.java
	Cryosa/src/ca/ualberta/cs/cmput301/cryosa/manager/OnStoriesAvailableListener.java
	Cryosa/src/ca/ualberta/cs/cmput301/cryosa/manager/PrefetchedIterator.java
	Cryosa/src/ca/ualberta/cs/cmput301/cryosa/manager/SlicedIterator.java
	Cryosa/src/ca/ualberta/cs/cmput301/cryosa/repository/StoryDatabase.java
	CryosaTest/src/ca/ualberta/cs/cmput301/cryosa/test/IStoryRepositoryTest.java
	CryosaTest/src/ca/ualberta/cs/cmput301/cryosa/test/SlicedIteratorTest.java
	CryosaTest/src/ca/ualberta/cs/cmput301/cryosa/test/StoryGenerator.java
Merge branch 'master' of
https://github.com/CMPUT301F13T14/Team14StoryBuilder.git

Conflicts:
	Cryosa/AndroidManifest.xml