Worked on assn3
Merge branch 'master' of https://github.com/dande011/cs12-assign