DB-function createUser
Mereg conflict
Merge branch 'master' of https://github.com/lukeeee/Royal-Hearts

Conflicts:
	config.php