teste
bla

Merge branch 'master' of github.com:agrings/wxPythonCookBookExamples

Conflicts:
	cap1/face-grin.png