adding IntelliJ IDEA project files *.iml to .gitignore
Merge branch 'master' of github.com:MalteJ/docker