up 5
up6
up6
voltando
juntando
Merge https://github.com/23edson/re-cmt-bdii

Conflicts:
	Buffer.c