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

Conflicts:
	cgi-bin/litterfall.py
	html/main.js
revised les' code a little bit
Merge branch 'master' of https://github.com/Swarthmore/litterfall