Novo Projeto TritomSystem em C#
Merge branch 'master' of https://github.com/NewSoftwares/Projeto_TritomSystem

Conflicts:
	ProjetoTritomSystem/nbproject/private/private.xml
Merge branch 'master' of https://github.com/NewSoftwares/Projeto_TritomSystem