Rättade till databas problemet
Merge branch 'master' of https://github.com/Walkingmage/OHLALA

Conflicts:
	dbconnect.php