major modification to class structure
Merge branch 'master' of https://github.com/jkieley/CSE360-Class-Project