git commit main.js
committing stuff...
Merge branch 'master' of https://github.com/Swarthmore/litterfall

Conflicts:
	html/main.js
addTree
changesssss
Merge branch 'master' of https://github.com/Swarthmore/litterfall

Conflicts:
	html/main.js