check
Merge branch 'master' of https://github.com/royercross/votaciones

Conflicts:
	logout.php