Updated log for delroy
Merge branch 'master' of https://github.com/brycepfrimmer/3350Project