Clean up the log
Merge branch 'master' of github.com:trbecker/comp-2014-1