finished getResults, return a json
Merge branch 'master' of https://github.com/tomkennedy22/DB-GUI-Fall2014

Conflicts:
	api/index.php