Update README.md
Update package.json
Resolve merge conflicts.
Merge branch 'elwayman02-consume-fake'