error debug
Merge branch 'master' of https://github.com/dstreamline/quest

Conflicts:
	index.php
black stripe error