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

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

Conflicts:
	static/index.html