Merge commit
Merge branch 'master' of https://github.com/Swarthmore/litterfall
Merge branch 'master' of https://github.com/Swarthmore/litterfall

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

Conflicts:
	html/templates/query-litterfall.html