commitando com conflito
Merge remote-tracking branch 'origin/master'

Conflicts:
	TrapSender/src/br/com/parks/principal/ClasseTeste.java