fgd
Merge branch 'master' of https://github.com/chrisland/testh6

Conflicts:
	db.php