Change 2 by mframpton
Merge branch 'master' of https://github.com/gitBanana/software_carpentry