criação do projeto no git
commit inicio exemplo
Merge branch 'master' of https://github.com/CarlosCurbani/MagnumSistemas

Conflicts:
	magnum/WebContent/WEB-INF/web.xml
	magnum/WebContent/index.html