Merge pull request #3 from lem-usp/master

mudancas pratica1
Hist e TS pratica 1
Hist e TS pratica 1
Hist e TS pratica 1
Hist e TS pratica 1
Hist e TS pratica 1
Hist e TS pratica 1
Merge pull request #6 from flamarquitti/master

Hist e TS pratica 1