Fixing everything
Merge branch 'master' of github.com:AndyMoreland/cs-244-project