conflicts er uit gehaald
Merge branch 'master' of https://github.com/Maiteh/php_project

Conflicts:
	classes/User.class.php
	login.php