have to figure out how to discard changes ha
Merge branch 'master' of https://github.com/nialljt/PhotoshopApp

Conflicts:
	src/PhotoAppPanel/PhotoApp.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/classes/ImageObject/ImageObj.class
	build/classes/PhotoAppPanel/PhotoApp$GifFileFilter.class
	build/classes/PhotoAppPanel/PhotoApp$JpegFileFilter.class
	build/classes/PhotoAppPanel/PhotoApp$PhotoAppPanel$1.class
	build/classes/PhotoAppPanel/PhotoApp$PhotoAppPanel.class
	build/classes/PhotoAppPanel/PhotoApp.class
	src/ImageObject/ImageObj.java
	src/PhotoAppPanel/PhotoApp.java