fix error. still in progress
Merge branch 'master' of github.com:vlee90/final-project into vincent-branch
Merge pull request #46 from vlee90/vincent-branch

Vincent branch