Collapsed the search code into a better calling function
Merge branch 'twendlan'
Added missing file
Merge branch 'master' of https://github.com/CMPUT391W14TTJ/c391RIS
merged james
' stuff
displaying images now works/working on the links