First commit
Second commit
Merge branch 'master' of github.com:igorffs/testing_presentation

Conflicts:
	.gitignore
index deletado