bugfix
Merge branch 'master' of https://github.com/jacobtexel/494Project3