merge
Merge branch 'master' of https://github.com/Cynus/PHPproject

Conflicts:
	login.php