gitignore VS files
gitignore VS files
more places
data and exercise 1 resolution added
absolute path changed
Merge
Resolving conflicts