changes
Merge branch 'master' of http://github.com/dev-laercio/teste

Conflicts:
	opa.py
Merge pull request #1 from dev-laercio/laercio

Laercio