added some docker stuff
resolve merge conflict
added some more documentation comments for docker