Beautifying the querying significantly
Merge branch 'master' of https://github.com/Swarthmore/litterfall

Conflicts:
	html/templates/css/custom.css
Merge branch 'master' of https://github.com/Swarthmore/litterfall