Cleaned up some stuff
Merge branch 'master' of github.com:Gollum999/CS328-hw7