linking system
Merge remote-tracking branch 'origin/master'

Conflicts:
	classes/Db.class.php
	index.php