Merge branches 'master' and 'searchBranch'
Searching now takes place in ViewStoriesActivity.
Searching now works from ViewStoriesActivity
Most Unit Tests Passing
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Searching works from ViewStoriesActivity, random story bug fixed, new methods have javadoc.
ll
License files
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	gen/ca/ualberta/CMPUT301F13T02/chooseyouradventure/R.java
	res/layout/view_stories_activity.xml
	res/menu/view_stories.xml
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java
fixed
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	gen/ca/ualberta/CMPUT301F13T02/chooseyouradventure/R.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java
Merge pull request #244 from KarlParkinson/master

Searching, unitTests