Tried changing some things

Signed-off-by: Nicholas Kamper <kampernj@rose-hulman.edu>
Merge branch 'master' of github.com:henderea/CSSE463TermProject