First Test
TextBox Test
pep8
Second Version
To be tested
Original
Merge branch 'master' of https://github.com/native93/Sugar-paint-activity

Conflicts:
	OficinaActivity.py