Added new_feature branch
Added name to README.md. Added test.rb to file.
I love MakerSquare
Fixed merge conflict