teste de interface
Merge branch 'master' of https://github.com/vvgaming/HarMegido

Conflicts:
	HarMegidoAndroid/src/org/vvgaming/harmegido/test/Main.java