Nova funcionalidade
Merge branch 'master' of https://github.com/mlcardoso/mission3

Conflicts:
	app/app.iml
	app/build.gradle
	app/proguard-rules.pro
	app/src/main/AndroidManifest.xml
	app/src/main/java/Dom/Contador.java
	app/src/main/res/values/dimens.xml
	app/src/main/res/values/strings.xml
	build/intermediates/model_data.bin
	local.properties
	settings.gradle