Added an emailer
Mean GItHub is making me commit
Merge branch 'master' of https://github.com/nichhk/Maven-Image-Collage

Conflicts:
	.idea/workspace.xml
	src/main/java/com/google/appengine/demos/ImageCollage/UploadServlet.java
	target/ImageCollage-1.0-SNAPSHOT.war
	target/ImageCollage-1.0-SNAPSHOT/ImageCollage.jsp
	target/ImageCollage-1.0-SNAPSHOT/WEB-INF/appengine-generated/datastore-indexes-auto.xml
	target/ImageCollage-1.0-SNAPSHOT/WEB-INF/appengine-generated/local_db.bin
	target/ImageCollage-1.0-SNAPSHOT/WEB-INF/classes/com/google/appengine/demos/ImageCollage/Collage.class
	target/ImageCollage-1.0-SNAPSHOT/WEB-INF/classes/com/google/appengine/demos/ImageCollage/Crawler.class
	target/ImageCollage-1.0-SNAPSHOT/WEB-INF/classes/com/google/appengine/demos/ImageCollage/CrawlerServlet$CrawlerSearch.class
	target/ImageCollage-1.0-SNAPSHOT/WEB-INF/classes/com/google/appengine/demos/ImageCollage/CrawlerServlet.class
	target/ImageCollage-1.0-SNAPSHOT/WEB-INF/classes/com/google/appengine/demos/ImageCollage/ProcessedImage.class
	target/ImageCollage-1.0-SNAPSHOT/WEB-INF/classes/com/google/appengine/demos/ImageCollage/UploadServlet.class
	target/maven-archiver/pom.properties
	target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
	target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
Created ImageMap
Bad commit
Merge https://github.com/nichhk/Maven-Image-Collage

Conflicts:
	.idea/workspace.xml
	src/main/java/com/google/appengine/demos/ImageCollage/Collage.java
	src/main/java/com/google/appengine/demos/ImageCollage/EmailCollage.java
	src/main/java/com/google/appengine/demos/ImageCollage/UploadServlet.java
	src/main/webapp/MakeCollage.jsp
	target/ImageCollage-1.0-SNAPSHOT.war
	target/ImageCollage-1.0-SNAPSHOT/CheckIndex.jsp
	target/ImageCollage-1.0-SNAPSHOT/MakeCollage.jsp
	target/ImageCollage-1.0-SNAPSHOT/WEB-INF/appengine-generated/datastore-indexes-auto.xml
	target/ImageCollage-1.0-SNAPSHOT/WEB-INF/appengine-generated/local_db.bin
	target/ImageCollage-1.0-SNAPSHOT/WEB-INF/classes/com/google/appengine/demos/ImageCollage/Collage.class
	target/ImageCollage-1.0-SNAPSHOT/WEB-INF/classes/com/google/appengine/demos/ImageCollage/Crawler.class
	target/ImageCollage-1.0-SNAPSHOT/WEB-INF/classes/com/google/appengine/demos/ImageCollage/EmailCollage.class
	target/ImageCollage-1.0-SNAPSHOT/WEB-INF/classes/com/google/appengine/demos/ImageCollage/UploadServlet.class
	target/maven-archiver/pom.properties
	target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
	target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
Modularized the Collage Master and fixed scaling and attribute table
Added comments
Added downloadImage for the larger collage blocks,
Added original URL links to the attribution table,
Added a download link
Merge pull request #2 from Vegetable26/master

Ummm... it might be really buggy, but I fixed the scaling, and have a really basic attribute table set up