Almost done but still has some bugs
Merge branch 'master' of https://github.com/mnzaki/adv-lab-proj2