Adição do meu nome
Merge branch 'master' of https://github.com/watinha/tutorial_git

Conflicts:
	alunos.txt
Merge branch 'master' of https://github.com/watinha/tutorial_git