end
e
modified gitignore
before merging