Merge remote-tracking branch 'origin/danny'

Conflicts:
	php/funcs.inc.php
Merge branch 'master' of https://github.com/DaemonDashHackathon/conQUESTador

Conflicts:
	php/funcs.inc.php