this is my commit
Merge branch 'master' of https://github.com/StanimirAngelov/Docker

Conflicts: