added colors

might want to change how yellow looks, though
Merge branch 'master' of https://github.com/CSE512-14W/a3-bdwalker-mbesweth

Conflicts:
	queries.js