fixing up some stuff
Merge branch 'master' of https://github.com/jbernie2/csc210final