FIXED THE BUG\!
Merge branch 'master' of github.com:gnuvince/comp512-assignment1