delete
little fixes
nothing
nothing
ignore--Merge branch 'master' of https://github.com/Samueltan/Dedup

Conflicts:
	src/gui/GUI.java