add dbconnect
Merge branch 'master' of https://github.com/AceMrSprayer/EMIS

Conflicts:
	dbconnect.php
Test update
Merge branch 'master' of https://github.com/AceMrSprayer/EMIS

Conflicts:
	test.php
troubleshoot content
Merge branch 'master' of https://github.com/AceMrSprayer/EMIS

Conflicts:
	troubleshootContent.php