all 7 main functions work, no equality functionality yet
Merge branch 'master' of https://github.com/drm8026/Team-Project-1-