story_list.xml
stories_list.xml
Merge branch 'master' of github.com:CMPUT301F13T06/ClassProject

Conflicts:
	res/layout/stories_list.xml
	res/menu/story_list.xml