Finally getting Thinkpad on board
Trying more to get all computers on board from Thinkpad

Merge branch 'master' of https://github.com/aroyston/software_carpentry_plot_inflammation

Conflicts:
	Testing.html
	Testing.md
Trying, once more, to get all computers on the same page from Thinkpad

Merge branch 'master' of https://github.com/aroyston/software_carpentry_plot_inflammation

Conflicts:
	figure/unnamed-chunk-2.png
	figure/unnamed-chunk-41.png
	figure/unnamed-chunk-42.png