Working on displaying an image (not complete)
Finished choosing and displaying image in the GUI
Merge branch 'master' into display_image

Conflicts:
	src/edu/lclark/drosophila/ButtonPanel.java