Merge pull request #23 from hatchan/feature_branch_1

Commit on feature_branch_1
Update README.md
Update README.md
Update README.md
Resolve conflict