first logging
Merge branch 'master' of github.com:z-neil/Ecse-428