v1.0
Merge branch 'master' of github.com:moritzf/config-files
First merge