Swapped search icon position
Merge branch 'master' of github.com:CMPUT301F13T06/ClassProject
Added method for adding an annotation to a story fragment
Added working SimpleAdapter from Anthony. Removed Read from context menu since read is done  by long press
Merge branch 'master' of github.com:CMPUT301F13T06/ClassProject
Added another textView for third item of a row in list
removed read from context menu
Merge branch 'master' of https://github.com/CMPUT301F13T06/ClassProject
nicer xml layout for stories
adventure feel
adventure feel
Online Stories search is done and the new adapter is added
Lowered the title font size on story list xml
Fixed adding annotation issues; now displays and saves text and images
Merge branch 'master' of github.com:CMPUT301F13T06/ClassProject
Merge branch 'master' into experimental

Conflicts:
	res/layout/stories_list.xml
	src/story/book/view/LocalStoriesActivity.java