Merge dev into main, resolved bootstrap.sh conflicts

Author: akhil27051999

bootstrap.sh

@@ -83,6 +83,7 @@ main() {
     install_postgres_client
     install_docker
     install_kubernetes_tools
+
     log "Bootstrap completed!"
     log "Please log out and log back in (or run 'newgrp docker') to use Docker without sudo."
     log "Run 'minikube start --driver=docker --nodes 3' to start your Kubernetes cluster."