Pull Request Final

Kevin Alfianto Jangtjik - 13510043
Mario Orlando Teng - 13510057
Kevin Winata - 13510073