fixes and stuff
Merge branch 'master' of https://github.com/dcbenas/CS2340.git