Fixed incorrect delete
Merge branch 'master' of github.com:eldermyoshida/hackduke

Conflicts:
	query.php