first view
Merge remote-tracking branch 'origin/master'
I deleted some things and forgot to pull before continuing.I deleted some things and forgot to pull before continuing.
borts