Complete task 3
Fix merge .gitignore