quick and dirty 2e tour
Merge and fix conflicts

Conflicts:
	index.html