Fixing harris
Merge branch 'master' of github.com:mdesanti/TPS-ATI

Conflicts:
	src/main/java/gui/tp4/Tp4.java
Fixed harris