Added readme
Modified README
Modified Readme
Wrote tests
Fixed conflict