log file mbp
Merge branch 'master' of https://github.com/daniel19/CSC-4100