added code to display results
Merge branches 'search' and 'master'