Teste Viwer Matriz
Merge remote-tracking branch 'upstream/master'
Ignorando persistence.xml
Merge pull request #14 from wcreis/master

Merge do David
Merge remote-tracking branch 'upstream/master'

Conflicts:
	MyGridPuc/build/classes/.gitignore
Finalização da criação do local.
Não está no layout novo, peço que o karlysson passe para o novo layout
enquanto vou concluir a TURMA
Merge branch 'master' of https://github.com/Danillo/MyGridPuc into Branch_master

Conflicts:
	MyGridPuc/build/classes/.gitignore
Merge remote-tracking branch 'upstream/master'

Conflicts:
	MyGridPuc/build/classes/.gitignore