akefile
Merge branch 'master' of https://github.com/renato-ys/mc504projeto2
Texto
Merge branch 'master' of https://github.com/renato-ys/mc504projeto2

Conflicts:
	banheiro.c