gitignore
Merge branch 'master' of github.com:vhinrich/vhinandrich2