initial commit
fix conflict
fix gitignore
fix gitignore
Merge pull request #3 from matcho3/fix_gitignore

Fix gitignore