tree edit
John Hennessy Rules!
deleted the john hennessy and scott klemmer paragraph, fixed conflicts