test
Merge app/views/test/index.html.erb