JB edit
I've changed something, JB
Merge branch 'master' of https://github.com/WilliamDunn1988/Example_from_-SWcarpentry

Conflicts:
	md.txt
JB editing again...