Dno
Merge branch 'master' of https://github.com/Mikkell/loginsystem

Conflicts:
	register.inc.php