Fixed gitignore
Merge branch 'step1' into step6