encoding
Merge branch 'master' of github.com:armin-joellenbeck/my-homepage