dockerize
Merge branch 'master' into dockerize
updated gitignore
Merge branch 'dockerize'