updates
Merge branch 'master' of https://github.com/vlee90/final-project into andrew-branch
Merge pull request #22 from vlee90/andrew-branch

Andrew branch