Step 1
Step-3
Step 2
Merge tag 'step-2'

Conflicts:
	x-normandyjug.html
Step 2
Merge tag 'step-3'

Conflicts:
	x-normandyjug.html