Login
Merge branch 'master' of https://github.com/pedrolobato/ensino-virtual

Conflicts:
	login.php
index