Changes suggested by Micheal
Merge remote-tracking branch 'origin/master'

Conflicts:
	step_1_3.html