24-format
Merge branch 'master' of github.com:Avitella/conf