resolvendo conflito
Merge branch 'master' of https://github.com/rbfagundes/TrapSender.git

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