Displaying status about running docker containers
Fixed merge conflicts