Merge branch 'step1' into step4
Fixed package.json
Merge branch 'step4' into step5