Alterações mínimas.
Merge origin/master

Conflicts:
	.gitignore
	run.sh
	run.sh~
	src/hyperheuristics/main/CompareHypervolumes.java
Merge with Giovani
Merge origin/master

Conflicts:
	.gitignore
	src/hyperheuristics/main/CompareHypervolumes.java