Mudou o JRE
Adicionado ao Git Ignore
merge
Merge branch 'master' of https://github.com/everton-santos/CookMyFood

Conflicts:
	src/com/everton/cookmyfood/Servlets/CadastroCategoriaServlet.java