9pm
Merge branch 'master' of github.com:jting0193/213photoalbum

Conflicts:
	src/cs213/photoAlbum/guiView/PhotoMenu.java