Logging
Merge branch 'master' of https://github.com/jackmacattack/Fred.git