Merge pull request #4 from vitornovo/master

Alterações login
Merge pull request #1 from thigambero/master

Alterações no login
header
Merge branch 'master' of https://github.com/renatonori/ubaduba

Conflicts:
	error_log.txt
header and index
Merge pull request #3 from renatonori/master

header and index