don't remember
Merge branch 'master' of https://github.com/sjoelinder/Portalen
Merge branch 'master' of https://github.com/sjoelinder/Portalen

Conflicts:
	signUp.php