Teste
Merge branch 'master' of https://github.com/brunogouveia/LPOO-C--.git

Conflicts:
	LPOO-C++/src/LPOO-C++.cpp
Arrumando conflitos
Classe String provavelmente pronta.