started adding combined logging
Merge branch 'matty' of https://github.com/CMPUT496/project into matty
fiddling with the log
updating logging