basically working copy of Mak's code
Merge branch 'master' of https://github.com/zaynashahzad24/CS149
basically a working version of Maks code