Merge branch 'master' of /home/ricc0082/Desktop/3601/UMM3601ursamajorIteration4 with conflicts.
Merge branch 'master' of https://github.com/casal033/UMM3601ursamajor
Removed old funtions
Merge branch 'master' of https://github.com/casal033/UMM3601ursamajor
Removed old funtions