Fix merge conflict

README.md

@@ -191,6 +191,7 @@ _Source:_ [What is Docker](https://www.docker.com/why-docker)
 - [InfluxDB, cAdvisor, Grafana](https://github.com/vegasbrianc/docker-monitoring) - InfluxDB Time series DB in combination with Grafana and cAdvisor by [@vegasbrianc][vegasbrianc]
 - [LogJam](https://github.com/gocardless/logjam) - Logjam is a log forwarder designed to listen on a local port, receive log entries over UDP, and forward these messages on to a log collection server (such as logstash) by [@gocardless](https://github.com/gocardless)
 - [Logspout](https://github.com/gliderlabs/logspout) - Log routing for Docker container logs by [@gliderlabs][gliderlabs]
+- [monit-docker](https://github.com/decryptus/monit-docker) - Monitor docker containers resources usage or status and execute docker commands or inside containers. [@decryptus][decryptus]
 - [NexClipper](https://github.com/NexClipper/NexClipper) - NexClipper is the container monitoring and performance management solution specialized in Docker, Apache Mesos, Marathon, DC/OS, Mesosphere, Kubernetes by [@Nexclipper](https://github.com/NexClipper)
 - [Out-of-the-box Host/Container Monitoring/Logging/Alerting Stack](https://github.com/uschtwill/docker_monitoring_logging_alerting) - Docker host and container monitoring, logging and alerting out of the box using cAdvisor, Prometheus, Grafana for monitoring, Elasticsearch, Kibana and Logstash for logging and elastalert and Alertmanager for alerting. Set up in 5 Minutes. Secure mode for production use with built-in [Automated Nginx Reverse Proxy (jwilder's)][nginxproxy].
 - [SwarmAlert](https://github.com/gpulido/SwarmAlert) - Monitors a Docker Swarm and sends Pushover alerts when it finds a container with no healthy service task running.
@@ -244,7 +245,7 @@ _Source:_ [What is Docker](https://www.docker.com/why-docker)
 - [OpenShift][openshift] - An open source PaaS built on [Kubernetes][kubernetes] and optimized for Dockerized app development and deployment by [Red Hat](https://www.redhat.com/en)
 - [Tsuru](https://github.com/tsuru/tsuru) - Tsuru is an extensible and open source Platform as a Service software
 - [Workflow](https://github.com/deis/workflow) - The open source PaaS for Kubernetes by [Deis](https://github.com/deis). Formerly Deis v1.
-- [ZEIT Now](https://github.com/zeit/now-cli) :heavy_dollar_sign: - A universal serverless single-command deploy for Node.js applications or any application with a Dockerfile.
+- [ZEIT Now](https://github.com/zeit/now) :heavy_dollar_sign: - A universal serverless single-command deploy for Node.js applications or any application with a Dockerfile.
 
 ### Reverse Proxy
 
@@ -330,6 +331,7 @@ Native desktop applications for managing and montoring docker hosts and clusters
 - [lazydocker](https://github.com/jesseduffield/lazydocker) - The lazier way to manage everything docker. A simple terminal UI for both docker and docker-compose, written in Go with the gocui library. By [@jesseduffield](https://github.com/jesseduffield)
 - [MultiDocker](https://github.com/marty90/multidocker) - Create a secure multi-user Docker machine, where each user is segregated into an indepentent container.
 - [ns-enter](https://github.com/jpetazzo/nsenter) - no more ssh, enter name spaces of container by [@jpetazzo][jpetazzo]
+- [Pdocker](https://github.com/g31s/Pdocker) - A simple tool to manage and maintain Docker for personal projects by [@g31s](g31s)
 - [Powerline-Docker](https://github.com/adrianmo/powerline-docker) - A Powerline segment for showing the status of Docker containers by [@adrianmo](https://github.com/adrianmo)
 - [proco](https://github.com/shiwaforce/poco) - Proco will help you to organise and manage Docker, Docker-Compose, Kubernetes projects of any complexity using simple YAML config files to shorten the route from finding your project to initialising it in your local environment. by [@shiwaforce](https://github.com/shiwaforce)
 - [reg](https://github.com/genuinetools/reg) - Docker registry v2 command line client by [@genuinetools][genuinetools]
@@ -418,6 +420,7 @@ Applications designed to help or simplify building **new** images
 ### Dockerfile
 
 - [chaperone-docker](https://github.com/garywiz/chaperone-docker) - A set of images using the Chaperone process manager, including a lean Alpine image, LAMP, LEMP, and bare-bones base kits.
+- [Dockerfile Generator](https://github.com/ozankasikci/dockerfile-generator) `dfg` is both a Go library and an executable that produces valid Dockerfiles using various input channels.
 - [Dockerfile Generator](https://jrruethe.github.io/blog/2015/09/20/dockerfile-generator/)
 - [Dockerfile Project](https://dockerfile.github.io/) - Trusted Automated Docker Builds. Dockerfile Project maintains a central repository of Dockerfile for various popular open source software services runnable on a Docker container.
 - [dockmoor](https://github.com/MeneDev/dockmoor) :construction: - Manage docker image references and help to create reproducible builds with Docker. By [@MeneDev](https://github.com/MeneDev)

data/latest

@@ -1 +1 @@
-data/2019-08-12T19.26.11-fetched_repo_data.json
+data/2019-08-27T19.34.10-fetched_repo_data.json

data/repository.json

@@ -53,6 +53,7 @@
   "https://github.com/vegasbrianc/docker-monitoring",
   "https://github.com/gocardless/logjam",
   "https://github.com/gliderlabs/logspout",
+  "https://github.com/decryptus/monit-docker",
   "https://github.com/NexClipper/NexClipper",
   "https://github.com/uschtwill/docker_monitoring_logging_alerting",
   "https://github.com/gpulido/SwarmAlert",
@@ -93,7 +94,7 @@
   "https://github.com/nanobox-io/nanobox",
   "https://github.com/tsuru/tsuru",
   "https://github.com/deis/workflow",
-  "https://github.com/zeit/now-cli",
+  "https://github.com/zeit/now",
   "https://github.com/vfarcic/docker-flow-proxy",
   "https://github.com/silarsis/docker-proxy",
   "https://github.com/fabiolb/fabio",
@@ -150,6 +151,7 @@
   "https://github.com/jesseduffield/lazydocker",
   "https://github.com/marty90/multidocker",
   "https://github.com/jpetazzo/nsenter",
+  "https://github.com/g31s/Pdocker",
   "https://github.com/adrianmo/powerline-docker",
   "https://github.com/shiwaforce/poco",
   "https://github.com/genuinetools/reg",
@@ -216,6 +218,7 @@
   "https://github.com/P3GLEG/Whaler",
   "https://github.com/Gueils/whales",
   "https://github.com/garywiz/chaperone-docker",
+  "https://github.com/ozankasikci/dockerfile-generator",
   "https://github.com/MeneDev/dockmoor",
   "https://github.com/arun-gupta/docker-images",
   "https://github.com/awesome-startup/docker-compose",