My first commit
version 2
conflict on gitignore after pull resolved