Adding error checks etc
Merge branch 'testing-phase' of https://github.com/abraunton/Quap into testing-phase

Conflicts:
	setup/db_setup.php