adjetivo update, guesser added
makefile updated
merge