this is not an empty message
Merge branch 'master' of https://github.com/kevinb7/cmput391

Conflicts:
	proj/search/queries.sql
	proj/search/sampledata.sql
	proj/search/searchsetup.sql
removed all 3 from my git
Merge branch 'master' of https://github.com/kevinb7/cmput391
completed help for search, added some changes to image.jsp and search.jsp for image display has not been testes yet, changes add record_id to the info sent and received by the jsp pages