fix merged lines#3

Open

keegoid wants to merge 2 commits intommumshad:masterfrom

Commits on Dec 11, 2019

fix merged lines
keegoid
committed

Commits on Dec 29, 2019

update gitignore
keegoid
committed