hopefully this doesn't screw it up
Merge branch 'master' of https://github.com/sethrosetter/CSCI4211
Merge branch 'master' of https://github.com/sethrosetter/CSCI4211
Changed calloc back to malloc
Merge branch 'master' of https://github.com/sethrosetter/CSCI4211