Fix bug in main.gsp
merge step-3-3
Merge branch 'step-4-1' into step-4-2
Merge branch 'step-4-2' into step-4-3