My first commit
Merge remote-tracking branch 'origin/master' into logingWork
Merge pull request #3 from AlecErasmus/logingWork

My first commit