funcionando background
Grafico adicionado
ignorado pasta build
merging conflict tree
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/Atividade.java
	app/src/main/java/Dom/Atividades.java
	app/src/main/java/Dom/Contador.java
	app/src/main/res/drawable-hdpi/ic_launcher.png
	app/src/main/res/drawable-mdpi/ic_launcher.png
	app/src/main/res/drawable-xhdpi/ic_launcher.png
	app/src/main/res/drawable-xxhdpi/ic_launcher.png
	app/src/main/res/menu/novo_tempo.xml
	app/src/main/res/values/dimens.xml
	app/src/main/res/values/strings.xml
	app/src/main/res/values/styles.xml
	settings.gradle