Issue #9: added name to read me
Issue #9: fixed conflict
Merge pull request #20 from egordon/feature/#9_Malachi_Branch

Issue #9: added name to read me