Added log files to gitignore
Merge branch 'master' of https://github.com/cdlib/shortcake
Merge branch 'master' of https://github.com/cdlib/shortcake