tree edit
John Hennessy Rules!
Merge branch 'master' of https://github.com/IntroHCI/lab1conflict

Conflicts:
	static/index.html
Resolution: two paragraphs