merging
Merge branch 'master' of https://github.com/CMPUT301F13T14/Team14StoryBuilder.git
small changes to editLinkActivity, ViewFragmentActivity
Merge branch 'master' of https://github.com/CMPUT301F13T14/Team14StoryBuilder.git
added a search button to browse stories
Merge branch 'master' of https://github.com/CMPUT301F13T14/Team14StoryBuilder
still working on search in browsestoriesactivity
Merge branch 'master' of https://github.com/CMPUT301F13T14/Team14StoryBuilder.git
surprise feature implemented(cached stories only)
Merge branch 'master' of https://github.com/CMPUT301F13T14/Team14StoryBuilder.git
merged