Pesquisar
Merge branch 'master' of http://github.com/magdielduarte/votaai

Conflicts:
	Votaai/Votaai/bin/Votaai.dll
	Votaai/Votaai/bin/Votaai.pdb

	modified:   Votaai/Votaai.v12.suo
	modified:   Votaai/Votaai/Cadastros.aspx
	modified:   Votaai/Votaai/UserControl/Candidato.ascx
	modified:   Votaai/Votaai/UserControl/Candidato.ascx.cs
	modified:   Votaai/Votaai/UserControl/Candidato.ascx.designer.cs
	modified:   Votaai/Votaai/UserControl/Usuario.ascx
	modified:   Votaai/Votaai/UserControl/Usuario.ascx.cs
	modified:   Votaai/Votaai/UserControl/Usuario.ascx.designer.cs
	deleted:    Votaai/Votaai/bin/ClassesBanco.dll
	deleted:    Votaai/Votaai/bin/ClassesBanco.pdb
	deleted:    Votaai/Votaai/bin/ClassesConexao.dll
	deleted:    Votaai/Votaai/bin/ClassesConexao.pdb
	deleted:    Votaai/Votaai/bin/Votaai.dll
	deleted:    Votaai/Votaai/bin/Votaai.dll.config
	deleted:    Votaai/Votaai/bin/Votaai.pdb