trying to make pieces show up
xMerge branch 'master' of https://github.com/Ccook/toddler-selfie

Conflicts:
	src/edu/american/toddlerselfie/ImageSlicer.java