Merge pull request #16 from FearsomeFoursome/master

branch
Merge pull request #17 from FearsomeFoursome/master

branch
added servlet, started functionality
added servlet, started functionality
created Category & CategoryList java classes to handle the catalog search objects;
Update to SQL injection checks
testing the icon files; no changes to code
Updates to connection to make it functional. Lots of updates to updater - still need to escape single quotes and figure out how to deal with duplicate/already-existing data, but SQL connection works and new rows can be written.
created a QueryCategories Servlet;
created a session object within the servlet;
***JSP has not yet been updated to test the servlet- completing this task next****
removed the TableException- altered to be a system.out.println;
fixes for some errors, no major changes
Created SearchProduct_servlet
Merge commit for Bella's work - merging files from Drive in
Merge commit for Bella's work - merging files from Drive in
merge SY branch into AR, cleaned up conflict
merge BB into AR/SY, to make later merging smoother
Update project.xml
updater fully functional! can read two different CSVs with different column ordering and write correctly - still needs output formatting
cleaned up HTML output - calling it done now
merged Scott's branch