Merge branch 'master' of https://github.com/eldermyoshida/hackduke

This reverts commit 8c77e1413925e7055219ac3747aa0b6264df3a9c, reversing
changes made to 3e8763d33af09e519de5e4fb0f222d2e7c6ec72b.

Conflicts:
	query.php