added functionality to display all results if the user requests it
fixed merge conflicts
Merge branch 'master' of github.com:mansam/textyserver
handling number of files > DISPLAY_CUTOFF
fixed merge conflict