Added new_feature branch
Added name to readme.md; added test.rb file
updated readme.md
Fixed merge conflicts