initialized in Local
Merge remote-tracking branch 'origin/master'

Conflicts:
  .gitignore
  README.md