Merge branch 'pharol' of github.com:arthurstomp/toDo
criando tarefa
Merge branch 'master' of https://github.com/arthurstomp/toDo into pharol

Conflicts:
	bin/FinalProject.apk
	bin/classes.dex