Made changes
Merge branch 'master' of https://github.com/davidheryanto/CS3246