another commit
Merge branch 'master' of github.com:eddition/gray_lady