Problem 1 solution
Merge gitignore