Merge pull request #51 from vlee90/vincent-branch

Vincent branch
fix match bugs
Merge branch 'master' of github.com:vlee90/final-project into vincent-branch