hope this solves the dirty worktree
Dirty worktree after pull.
Dirty filthy master branch
Pushing Eriks changes
Merge branch 'master' of https://github.com/erikduvet/GitWarriors into
kostas

Conflicts:
	GitWarriorSolution/src/com/example/gitwarriorsolution/SearchResults.java