Preparing for image display
gui
Preparing for image display
Merge branch 'master' of https://github.com/reastland/CSCI5828PhotoApp

Conflicts:
	CSCI5828PhotoApp/src/GUI.java