For Rob to look at
Merge https://github.com/anthony-b/Treebook-2

Conflicts:
	.gitignore
Merge https://github.com/anthony-b/Treebook-2