Exercise 1-4 and .gitignore update
Resolving merge conflict in .gitignore