tentando corrigir problemas de merge.
Merge branch 'master' of https://github.com/viniciusmayer/java-oo.git

Conflicts:
	src/br/com/ftec/ads/poo/dao/UsuarioDAO.java
	src/br/com/ftec/ads/poo/main/Principal.java