Com pontuacao
Merge branch 'master' of github.com:tvale/git-workshop

Conflicts:
	main.c