Commiting changes to resolve pull issues
Merge branch 'master' of https://github.com/erikduvet/GitWarriors into
kostas

Conflicts:
	GitWarriorSolution/src/com/example/gitwarriorsolution/SearchResults.java
Commitint searchResults
Merge branch 'master' of https://github.com/erikduvet/GitWarriors into kostas
Implemented search based on a date
Merge branch 'kostas'