asd
Merge branch 'master' of https://github.com/J-Johannessen/betproject

Conflicts:
	loginsession.php