init merge
Merge branch 'master' of https://github.com/Linowzin/trabalhoED2

Conflicts:
	LocadoraED2.c