Cleaned up
Merge branch 'master' of https://github.com/yeajim/Cmpt473Assign1