Merge changes
Changed gitignore