Fix git merge conflict: unrelated histories, ignored artifacts, and .gitignore gaps
#17
+41
−10
.gitignore gaps
#17