Conflitos
Merge branch 'master' of https://github.com/maiconmichelon/Padroes.git

Conflicts:
	SimUDuck/src/iterator/MenuItem.java