Should fix stuff
Fixed stupid things
Merge branch 'master' of https://github.com/knusbaum/CS427-Final.git