Added new_feature branch
Added name to readme.md.  Added test.rb file
I love MKS!
Fixed merge conflict