update

update
nothing new

Conflicts:
	CSCI5828PhotoApp/src/GUI.java