commit
commit
Merge branch 'master' of github.com:UDav/FindDuplicate

Conflicts:
	src/com/udav/findduplicate/ImgFrame.java
	src/com/udav/findduplicate/MainFrame.java
	src/com/udav/findduplicate/MyImage.java