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