m
Merge branch 'master' of github.com:thnbgr/CS310-Lab-4
merge
fixing minor issues
merge