a partir daqui KISS
Merge branch 'master' of github.com:WillianJunior/ProjetoSO

Conflicts:
	ProjetoSO/basic_types.h