Local change before attemptung merge
Merge branch 'master' of https://github.com/NadineKalmoni/Software_Carpentry_2013

Conflicts:
	index.md