comit2
Merge branch 'master' of
https://github.com/erickdeoliveiraleal/teste.git

Conflicts:
	testehub/WebContent/index.jsp