Pull request discussion
Merge branch 'master' of github.com:UCL/ucl_software_carpentry

Conflicts:
	git/git_instructions.md