updated /trees cmd+f:diff to see all changes
automated update
edits today
.
Merge branch 'master' of github.com:carnotweat/feed

Conflicts:
	html/feed/feed.xml
	html/index.html
	html/scripts/index.html
	html/trees/index.html
edits today
edits today
edits today