updated readme
fixed gulpfile
Merge branch 'step12'