Download and display works
Fixed display of pins, but CSS needs work
added some file validation
fighting the merge
fighting the merge
Merge buckA into buckB
fighting the merge
Merge uploadPhotos

Conflicts:
	dbOps.php
	index.php
	upload.php