Describe git
Merge branch 'master' into flesh-out-content

Conflicts:
	index.html