Updates to simple query, removed inputted json
Merge branch 'master' of https://github.com/moosemn456/lightwait

Conflicts:
	Web/javascript/data.js