Merge branch 'annisa-grpc' into 'master'

Update readme (conflict)

See merge request !3

README.md

@@ -6,16 +6,9 @@ Cara menjalankan program :
 ```
 
 Keterangan :
-<<<<<<< HEAD
 <br/>Komunikasi Auth-Frontend : REST
 <br/>Komunikasi Auth-Service Lain : gRPC
 
 Link Server :
 <br/>REST: http://34.71.162.16:8000/
 <br/>gRPC: 34.71.162.16:50051
-
-
-=======
-Komunikasi Auth-Frontend : REST
-Komunikasi Auth-Service Lain : gRPC
->>>>>>> 5e72b905b59c430ea751f9765e7058dee6d248d2