Another change by James
Merge branch 'master' of github.com:PeterDavison/swCarpentry

Conflicts:
	index.md