JB1
Merge branch 'master' of https://github.com/liciaray/SWCarp

Conflicts:
	thirdfile.txt