Fixed everything
Merge branch 'master' of https://github.com/piaoasd123/IMGD3000PROJ2