local changes
Merge branch 'master' of https://github.com/scardine/graficos

Conflicts:
	misc/variavieis.py