second commit
merging gitignore