initial git initialization
Merge branch 'master', remote branch 'origin/master'

Conflicts: