Fixed gitignore
Merge branch 'step1' into step12
Cleaned up