formatted style
sample upload code to be edited
Merge branch 'master' of git://github.com/jbonot/CMPUT391GroupProject.git
webpage for single image, updated java file
Merge branch 'master' of
git://github.com/jbonot/CMPUT391GroupProject.git

Conflicts:
	classes/proj1/SQLAdapter.java
resolved merge conflicts
Merge branch 'master' of git://github.com/jbonot/CMPUT391GroupProject.git
added prepared statements to UploadImage.java, added use of cookies,
added date dropdowns in html page.

Added sequence to setup.sql to generate photo id's.
Merge branch 'master' of git://github.com/jbonot/CMPUT391GroupProject.git
added proj1 import
added form for multiple image data
minor changes
Merge branch 'master' of git://github.com/jbonot/CMPUT391GroupProject.git