Começando a perturbação.
Merge branch 'master' of https://github.com/cetleite/SAOptimization

Conflicts:
	SAOptimization/src/saoptimization/SAOptimization.java