first commit
change in we paragraph
conflict on gitignore resolved