get rid of (now) useless classes
more delicious implementation
Merge branch 'master' of https://github.com/dmacthedestroyer/TCSS_558_HW3