lots of changes, works pretty well now
Merge branch 'master' of github.com:chris-costello6/CSCI4273-pa3