Updates to Module 1
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	modules/m1/exercises/L04.md
	modules/m1/index.md