Tan Weekend changes
fixed index.html.erb merge conflict