criacao metodos kambam
Merge branch 'master' of https://github.com/Linowzin/trabalhoED2

Conflicts:
	LocadoraED2.c
	LocadoraED2.exe
	LocadoraED2.o