editing someone else's work
merged with changes from internet
Merge branch 'master' of https://github.com/NadineKalmoni/Software_Carpentry_2013