login users
Merge branch 'master' of https://github.com/Lotto/HH2K13

Conflicts:
	config.php