Commit parcial da AssistenciaGol
Merge branch 'master' of https://github.com/tgmarinho/futebolgalaxias

Conflicts:
	gen/br/fenomeno/activities/R.java
git ignore
$ git rm -r --cached .
$ git add .
classe R resolve conflito