Alteracoes
Merge branch 'master' of https://github.com/pedrofrozi/trabalho-ttp-ag1

Conflicts:
	TrabOC-AGxTTP/src/Individual.cpp