:boom::camel: Added .gitattributes & .gitignore files
tudo de Instituicao e TipoCurso; Concertei as interfaces;
Merge pull request #3 from MayaraAmanda/master

Merge pull request #1 from AngeloMendes/master
teste
Merge branch 'master' of https://github.com/AngeloMendes/SCP

Conflicts:
	src/java/controller/CadastrarInstituicaoController.java
	src/java/controller/CadastrarTipoCursoController.java
	src/java/controller/PesquisarInstituicaoController.java
	src/java/controller/PesquisarTipoCursoController.java
	src/java/dao/InstituicaoDAO.java
	src/java/dao/TipoCursoDAO.java
	src/java/javaSCP/Bolsista.java
	src/java/javaSCP/Campus.java
	src/java/javaSCP/Edital.java
	src/java/javaSCP/Funcionario.java
	src/java/javaSCP/Instituicao.java
	src/java/javaSCP/Orientador.java
	src/java/javaSCP/Parametro.java
	src/java/javaSCP/Pessoa.java
	src/java/javaSCP/TipoCurso.java
	web/index.jsp
Merge pull request #4 from AngeloMendes/master

ok