Search Initial Population fixed
Search but no scroll
Doc Strings
test
Merge branch 'master' of
https://github.com/CMPUT301F13T07/Team07Story.git

Conflicts:
	AdventureStoryFinal/src/edu/ualberta/adventstory/SearchActivity.java
	TestAdventureStoryFinal/.settings/org.eclipse.jdt.core.prefs