adding more problems
checking in gitignore
merging and adding files