Locales
Merge branch 'master' of github.com:marvelousNinja/coffin