Ability to search ES working. Android end of searching still to be done. Searchable Activity not launching when supposeed to.
Can now search and retrieve results from ES, display results and read stories when clicked on. ES only returning 10 results per query though
Searching works
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into searchBranch
Searching and random story now work with ES. Just need to extend to work with locally stored data.
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into searchBranch

Conflicts:
	res/values/strings.xml
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java
Added launcher and app icons
Merge pull request #215 from klindenbach/master

Spaciba
Fixed fighting bug
Please enter the commit message for your changes. Lines starting
Fixed sign problem
Merge pull request #218 from jcadek/master

Fixed fighting bug
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into searchBranch

Conflicts:
	gen/ca/ualberta/CMPUT301F13T02/chooseyouradventure/R.java
Merge pull request #217 from tbendubois/master

Added launcher and app icons
Merge pull request #219 from KarlParkinson/searchBranch

Search branch
Merge branches 'master' and 'searchBranch'
Searching now takes place in ViewStoriesActivity.
Refactoring, Phase 1
Refactoring, Phase 2: Split Controller into 3 controllers
Forgot to add new files
Extracted FightingView