Update README.md

Added drone status badge.
Fixed merge conflicts