Corrigindo
Merge remote-tracking branch 'origin/master'

Conflicts:
	acrof2/bin/classes/com/example/acrof2/MainActivity.class